Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios] Paths moved under the shared directory

Browse Source 
Upstream seems to be moving things around on iOS, and leaving certain
targets under a shared path. This change corrects our inclusion paths
for the Paths target, to refer to it under the shared path.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/c41774725dc52610225ac8f7f9fb1807da6bb314

commit c41774725dc52610225ac8f7f9fb1807da6bb314
Author: Gauthier Ambard <gambard@chromium.org>
Date:   Fri Jun 16 16:03:08 2023 +0000

    [iOS] Move paths to shared folder

    Bug: 1319852
This commit is contained in:
Claudio DeSouza
2023-07-26 16:50:38 -04:00
committed by mkarolin
parent 82ba0767fc
commit a8dfa37272
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/ios/chrome/browser/application_context/application_context_impl.mm
+1 -1
View File
@@ -37,7 +37,6 @@
#import "ios/chrome/browser/crash_report/breadcrumbs/application_breadcrumbs_logger.h"
#include "ios/chrome/browser/history/history_service_factory.h"
#include "ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h"
#include "ios/chrome/browser/paths/paths.h"
#include "ios/chrome/browser/policy/browser_policy_connector_ios.h"
#include "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h"
#import "ios/chrome/browser/promos_manager/promos_manager.h"
@@ -45,6 +44,7 @@
#include "ios/chrome/browser/segmentation_platform/otr_web_state_observer.h"
#include "ios/chrome/browser/shared/model/application_context/application_context.h"
#include "ios/chrome/browser/shared/model/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/shared/model/paths/paths.h"
#include "ios/chrome/browser/shared/model/prefs/browser_prefs.h"
#include "ios/chrome/browser/shared/model/prefs/pref_names.h"
#include "ios/chrome/browser/signin/system_identity_manager.h"
ios/app/BUILD.gn
+1 -1
View File
@@ -74,10 +74,10 @@ source_set("app") {
"//ios/chrome/browser/history",
"//ios/chrome/browser/main",
"//ios/chrome/browser/passwords:store_factory",
"//ios/chrome/browser/paths:paths",
"//ios/chrome/browser/providers/ui_utils:chromium_ui_utils",
"//ios/chrome/browser/shared/model/application_context",
"//ios/chrome/browser/shared/model/browser_state",
"//ios/chrome/browser/shared/model/paths",
"//ios/chrome/browser/shared/model/web_state_list",
"//ios/chrome/browser/shared/public/commands",
"//ios/chrome/browser/sync",
ios/app/brave_core_main.mm
+1 -1
View File
@@ -56,13 +56,13 @@
#include "ios/chrome/browser/history/history_service_factory.h"
#include "ios/chrome/browser/history/web_history_service_factory.h"
#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"
#include "ios/chrome/browser/paths/paths.h"
#include "ios/chrome/browser/shared/model/application_context/application_context.h"
#include "ios/chrome/browser/shared/model/browser/browser.h"
#include "ios/chrome/browser/shared/model/browser/browser_list.h"
#include "ios/chrome/browser/shared/model/browser/browser_list_factory.h"
#include "ios/chrome/browser/shared/model/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/shared/model/browser_state/chrome_browser_state_manager.h"
#include "ios/chrome/browser/shared/model/paths/paths.h"
#include "ios/chrome/browser/shared/model/web_state_list/web_state_list.h"
#include "ios/chrome/browser/shared/public/commands/command_dispatcher.h"
#include "ios/chrome/browser/sync/send_tab_to_self_sync_service_factory.h"
ios/browser/BUILD.gn
+1 -1
View File
@@ -51,9 +51,9 @@ source_set("browser") {
"//ios/chrome/browser/browser_state:browser_state",
"//ios/chrome/browser/flags",
"//ios/chrome/browser/flags:client_side",
"//ios/chrome/browser/paths",
"//ios/chrome/browser/shared/model/application_context",
"//ios/chrome/browser/shared/model/browser_state",
"//ios/chrome/browser/shared/model/paths",
"//ios/chrome/browser/shared/model/url:constants",
"//ios/components/webui:url_constants",
"//ios/web/public",
ios/browser/api/brave_wallet/BUILD.gn
+1 -1
View File
@@ -44,8 +44,8 @@ source_set("brave_wallet") {
"//brave/ios/browser/api/url",
"//brave/ios/browser/brave_wallet",
"//ios/chrome/browser/content_settings",
"//ios/chrome/browser/paths:paths",
"//ios/chrome/browser/shared/model/browser_state",
"//ios/chrome/browser/shared/model/paths",
"//net",
"//ui/base",
]
ios/browser/api/brave_wallet/token_registry_utils.mm
+1 -1
View File
@@ -11,7 +11,7 @@
#include "base/version.h"
#include "brave/components/brave_wallet/browser/brave_wallet_constants.h"
#include "brave/components/brave_wallet/browser/wallet_data_files_installer.h"
#include "ios/chrome/browser/paths/paths.h"
#include "ios/chrome/browser/shared/model/paths/paths.h"
@implementation BraveWalletTokenRegistryUtils
ios/browser/brave_web_main_parts.mm
+1 -1
View File
@@ -22,9 +22,9 @@
#include "ios/chrome/browser/application_context/application_context_impl.h"
#include "ios/chrome/browser/browser_state/browser_state_keyed_service_factories.h"
#include "ios/chrome/browser/flags/about_flags.h"
#include "ios/chrome/browser/paths/paths.h"
#include "ios/chrome/browser/shared/model/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/shared/model/browser_state/chrome_browser_state_manager.h"
#include "ios/chrome/browser/shared/model/paths/paths.h"
#include "ios/web/public/thread/web_task_traits.h"
#include "ios/web/public/thread/web_thread.h"
#include "ui/base/l10n/l10n_util_mac.h"