Replace relative paths in chromium_src to src-based.
# Conflicts: # chromium_src/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc # chromium_src/chrome/browser/ui/views/bubble/bubble_contents_wrapper.cc # chromium_src/chrome/browser/ui/views/page_info/page_info_bubble_view.cc # chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.h # chromium_src/chrome/common/webui_url_constants.cc # chromium_src/components/safe_browsing/content/browser/client_side_model_loader.cc # chromium_src/components/translate/core/browser/translate_prefs.cc # chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.cc # chromium_src/third_party/blink/renderer/core/loader/subresource_redirect_util.h
This commit is contained in:
Aleksey Khoroshilov
@@ -24,4 +24,4 @@ void AddAndroidWidevine(
|
||||
} // namespace cdm
|
||||
#endif // BUILDFLAG(ENABLE_WIDEVINE)
|
||||
|
||||
#include "../../../../android_webview/renderer/aw_key_systems.cc"
|
||||
#include "src/android_webview/renderer/aw_key_systems.cc"
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
#define NACL_TC_REV 1
|
||||
#endif
|
||||
#endif
|
||||
#include "../../../base/check.cc"
|
||||
#include "src/base/check.cc"
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
#define NACL_TC_REV 1
|
||||
#endif
|
||||
#endif
|
||||
#include "../../../base/check_op.cc"
|
||||
#include "src/base/check_op.cc"
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
#define NACL_TC_REV 1
|
||||
#endif
|
||||
#endif
|
||||
#include "../../../../base/debug/alias.cc"
|
||||
#include "src/base/debug/alias.cc"
|
||||
|
||||
@@ -69,6 +69,6 @@ static inline bool operator<(const std::reference_wrapper<const Feature>& lhs,
|
||||
#define default_state \
|
||||
name&& internal::GetDefaultOrOverriddenFeatureState(feature)
|
||||
|
||||
#include "../../../base/feature_list.cc"
|
||||
#include "src/base/feature_list.cc"
|
||||
|
||||
#undef default_state
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
#define NACL_TC_REV 1
|
||||
#endif
|
||||
#endif
|
||||
#include "../../../base/logging.cc"
|
||||
#include "src/base/logging.cc"
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
#define NACL_TC_REV 1
|
||||
#endif
|
||||
#endif
|
||||
#include "../../../base/notreached.cc"
|
||||
#include "src/base/notreached.cc"
|
||||
|
||||
@@ -15,7 +15,7 @@ class IpfsService;
|
||||
friend class ::BraveBrowsingDataRemoverDelegate; \
|
||||
friend class ipfs::IpfsService;
|
||||
|
||||
#include "../../../../base/threading/thread_restrictions.h"
|
||||
#include "src/base/threading/thread_restrictions.h"
|
||||
#undef BRAVE_SCOPED_ALLOW_BASE_SYNC_PRIMITIVES_H
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_BASE_THREADING_THREAD_RESTRICTIONS_H_
|
||||
|
||||
@@ -20,7 +20,7 @@ using string = ::std::string;
|
||||
#define throw CHECK(false) <<
|
||||
#define ios_base brave
|
||||
#define failure string
|
||||
#include "../../../../../../../brave/third_party/bitcoin-core/src/src/serialize.h"
|
||||
#include "src/brave/third_party/bitcoin-core/src/src/serialize.h"
|
||||
#undef throw
|
||||
#undef ios_base
|
||||
#undef string
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
#undef __x86_64__
|
||||
#endif
|
||||
|
||||
#include "../../../../../../../../brave/third_party/ethash/src/lib/keccak/keccak.c"
|
||||
#include "src/brave/third_party/ethash/src/lib/keccak/keccak.c"
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
#include "brave/app/brave_main_delegate.h"
|
||||
|
||||
#define ChromeMainDelegate BraveMainDelegate
|
||||
#include "../../../../../chrome/app/android/chrome_main_delegate_android.cc"
|
||||
#include "src/chrome/app/android/chrome_main_delegate_android.cc"
|
||||
#undef ChromeMainDelegate
|
||||
|
||||
@@ -6,6 +6,6 @@
|
||||
#define BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_COMMAND_IDS_H_
|
||||
|
||||
#include "brave/app/brave_command_ids.h"
|
||||
#include "../../../../chrome/app/chrome_command_ids.h"
|
||||
#include "src/chrome/app/chrome_command_ids.h"
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_COMMAND_IDS_H_
|
||||
|
||||
@@ -5,5 +5,5 @@
|
||||
#include "brave/app/brave_main_delegate.h"
|
||||
|
||||
#define ChromeMainDelegate BraveMainDelegate
|
||||
#include "../../../../chrome/app/chrome_main.cc"
|
||||
#include "src/chrome/app/chrome_main.cc"
|
||||
#undef ChromeMainDelegate
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
|
||||
// This chormium_src override allows us to skip a lot of patching to
|
||||
// chrome/BUILD.gn
|
||||
#include "brave/app/brave_command_line_helper.cc" // NOLINT
|
||||
#include "brave/app/brave_main_delegate.cc" // NOLINT
|
||||
#include "../../../../chrome/app/chrome_main_delegate.cc" // NOLINT
|
||||
#include "brave/app/brave_command_line_helper.cc"
|
||||
#include "brave/app/brave_main_delegate.cc"
|
||||
#include "src/chrome/app/chrome_main_delegate.cc"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "chrome/common/chrome_content_client.h"
|
||||
|
||||
#define ChromeContentClient BraveContentClient
|
||||
#include "../../../../chrome/app/chrome_main_delegate.h"
|
||||
#include "src/chrome/app/chrome_main_delegate.h"
|
||||
#undef ChromeContentClient
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_APP_CHROME_MAIN_DELEGATE_H_
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
|
||||
#include "brave/browser/about_flags.cc"
|
||||
|
||||
#include "../../../../chrome/browser/about_flags.cc"
|
||||
#include "src/chrome/browser/about_flags.cc"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#define BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION() (1)
|
||||
#endif
|
||||
|
||||
#include "../../../../chrome/browser/active_use_util.cc"
|
||||
#include "src/chrome/browser/active_use_util.cc"
|
||||
|
||||
#if defined(OS_WIN) && defined(OFFICIAL_BUILD)
|
||||
#undef BUILDFLAG_INTERNAL_USE_GOOGLE_UPDATE_INTEGRATION
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; \
|
||||
break; \
|
||||
|
||||
#include "../../../../../../chrome/browser/android/browsing_data/browsing_data_bridge.cc"
|
||||
#include "src/chrome/browser/android/browsing_data/browsing_data_bridge.cc"
|
||||
#undef BRAVE_CLEAR_BROWSING_DATA
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
#include "components/omnibox/browser/autocomplete_controller.h"
|
||||
|
||||
#define ChromeAutocompleteSchemeClassifier BraveAutocompleteSchemeClassifier
|
||||
#include "../../../../../../chrome/browser/android/omnibox/autocomplete_controller_android.cc"
|
||||
#include "src/chrome/browser/android/omnibox/autocomplete_controller_android.cc"
|
||||
#undef ChromeAutocompleteSchemeClassifier
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#define JNI_AboutSettingsBridge_GetApplicationVersion \
|
||||
JNI_AboutSettingsBridge_GetApplicationVersion_ChromiumImpl
|
||||
#include "../../../../../../chrome/browser/android/preferences/about_settings_bridge.cc"
|
||||
#include "src/chrome/browser/android/preferences/about_settings_bridge.cc"
|
||||
#undef JNI_AboutSettingsBridge_GetApplicationVersion
|
||||
|
||||
static ScopedJavaLocalRef<jstring>
|
||||
|
||||
@@ -21,6 +21,6 @@ class UnusedClass {
|
||||
|
||||
#define Java_SigninManagerImpl_create Java_BraveSigninManager_create
|
||||
#define Java_SigninManagerImpl_destroy Java_BraveSigninManager_destroy
|
||||
#include "../../../../../../chrome/browser/android/signin/signin_manager_android.cc" // NOLINT
|
||||
#include "src/chrome/browser/android/signin/signin_manager_android.cc"
|
||||
#undef Java_SigninManagerImpl_create
|
||||
#undef Java_SigninManagerImpl_destroy
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "../../../../../../chrome/browser/apps/app_discovery_service/app_discovery_features.cc"
|
||||
#include "src/chrome/browser/apps/app_discovery_service/app_discovery_features.cc"
|
||||
|
||||
#include "base/feature_override.h"
|
||||
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
#include "components/omnibox/browser/autocomplete_controller.h"
|
||||
|
||||
#define ChromeAutocompleteSchemeClassifier BraveAutocompleteSchemeClassifier
|
||||
#include "../../../../../chrome/browser/autocomplete/autocomplete_classifier_factory.cc"
|
||||
#include "src/chrome/browser/autocomplete/autocomplete_classifier_factory.cc"
|
||||
#undef ChromeAutocompleteSchemeClassifier
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "../../../../../chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc"
|
||||
#include "src/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.cc"
|
||||
|
||||
BitmapFetcherService::RequestId BitmapFetcherService::RequestImage(
|
||||
const GURL& url,
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
const net::NetworkTrafficAnnotationTag& traffic_annotation); \
|
||||
RequestId RequestImage
|
||||
|
||||
#include "../../../../../chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
|
||||
#include "src/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
|
||||
#undef RequestImage
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BITMAP_FETCHER_BITMAP_FETCHER_SERVICE_H_
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
|
||||
#define GetBrowserContextRedirectedInIncognito \
|
||||
GetBrowserContextRedirectedInIncognitoOverride
|
||||
#include "../../../../../chrome/browser/bookmarks/bookmark_model_factory.cc"
|
||||
#include "src/chrome/browser/bookmarks/bookmark_model_factory.cc"
|
||||
|
||||
@@ -7,4 +7,4 @@
|
||||
|
||||
#define GetBrowserContextRedirectedInIncognito \
|
||||
GetBrowserContextRedirectedInIncognitoOverride
|
||||
#include "../../../../../chrome/browser/bookmarks/managed_bookmark_service_factory.cc"
|
||||
#include "src/chrome/browser/bookmarks/managed_bookmark_service_factory.cc"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#define HandleChromeAboutAndChromeSyncRewrite \
|
||||
HandleChromeAboutAndChromeSyncRewrite_ChromiumImpl
|
||||
#include "../../../../chrome/browser/browser_about_handler.cc"
|
||||
#include "src/chrome/browser/browser_about_handler.cc"
|
||||
#undef HandleChromeAboutAndChromeSyncRewrite
|
||||
|
||||
#include "brave/common/url_constants.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "../../../../chrome/browser/browser_features.cc"
|
||||
#include "src/chrome/browser/browser_features.cc"
|
||||
|
||||
#include "base/feature_override.h"
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "brave/browser/extensions/brave_extensions_browser_client_impl.h"
|
||||
#define ChromeExtensionsBrowserClient BraveExtensionsBrowserClientImpl
|
||||
#endif
|
||||
#include "../../../../chrome/browser/browser_process_impl.cc"
|
||||
#include "src/chrome/browser/browser_process_impl.cc"
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#undef ChromeExtensionsBrowserClient
|
||||
#endif
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "services/network/public/mojom/network_service.mojom-forward.h"
|
||||
|
||||
#define Init virtual Init
|
||||
#include "../../../../chrome/browser/browser_process_impl.h"
|
||||
#include "src/chrome/browser/browser_process_impl.h"
|
||||
#undef Init
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
|
||||
|
||||
@@ -11,7 +11,7 @@ class BraveBrowsingDataRemoverDelegate;
|
||||
#define BRAVE_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H \
|
||||
friend class BraveBrowsingDataRemoverDelegate;
|
||||
|
||||
#include "../../../../../chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
|
||||
#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
|
||||
#undef BRAVE_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_BROWSING_DATA_CHROME_BROWSING_DATA_REMOVER_DELEGATE_H_
|
||||
|
||||
+1
-1
@@ -5,4 +5,4 @@
|
||||
|
||||
#include "brave/browser/browsing_data/brave_browsing_data_remover_delegate.h"
|
||||
|
||||
#include "../../../../../chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc"
|
||||
#include "src/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.cc"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
BraveUntrustedWebUIControllerFactory::RegisterInstance(); \
|
||||
ChromeUntrustedWebUIControllerFactory
|
||||
#endif
|
||||
#include "../../../../chrome/browser/chrome_browser_main.cc"
|
||||
#include "src/chrome/browser/chrome_browser_main.cc"
|
||||
#if !defined(OS_ANDROID)
|
||||
#undef ChromeUntrustedWebUIControllerFactory
|
||||
#endif
|
||||
|
||||
@@ -9,5 +9,5 @@
|
||||
#include "chrome/browser/chrome_browser_main.h"
|
||||
|
||||
#define ChromeBrowserMainParts BraveBrowserMainParts
|
||||
#include "../../../../chrome/browser/chrome_browser_main_android.cc" // NOLINT
|
||||
#include "src/chrome/browser/chrome_browser_main_android.cc"
|
||||
#undef ChromeBrowserMainParts
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "chrome/browser/chrome_browser_main.h"
|
||||
|
||||
#define ChromeBrowserMainParts BraveBrowserMainParts
|
||||
#include "../../../../chrome/browser/chrome_browser_main_android.h" // NOLINT
|
||||
#include "src/chrome/browser/chrome_browser_main_android.h"
|
||||
#undef ChromeBrowserMainParts
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_CHROME_BROWSER_MAIN_ANDROID_H_
|
||||
|
||||
@@ -9,5 +9,5 @@
|
||||
#include "chrome/browser/chrome_browser_main.h"
|
||||
|
||||
#define ChromeBrowserMainParts BraveBrowserMainParts
|
||||
#include "../../../../chrome/browser/chrome_browser_main_posix.cc" // NOLINT
|
||||
#include "src/chrome/browser/chrome_browser_main_posix.cc"
|
||||
#undef ChromeBrowserMainParts
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "chrome/browser/chrome_browser_main.h"
|
||||
|
||||
#define ChromeBrowserMainParts BraveBrowserMainParts
|
||||
#include "../../../../chrome/browser/chrome_browser_main_posix.h" // NOLINT
|
||||
#include "src/chrome/browser/chrome_browser_main_posix.h"
|
||||
#undef ChromeBrowserMainParts
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_CHROME_BROWSER_MAIN_POSIX_H_
|
||||
|
||||
@@ -9,5 +9,5 @@
|
||||
#include "chrome/browser/chrome_browser_main.h"
|
||||
|
||||
#define ChromeBrowserMainParts BraveBrowserMainParts
|
||||
#include "../../../../chrome/browser/chrome_browser_main_win.cc" // NOLINT
|
||||
#include "src/chrome/browser/chrome_browser_main_win.cc"
|
||||
#undef ChromeBrowserMainParts
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "chrome/browser/chrome_browser_main.h"
|
||||
|
||||
#define ChromeBrowserMainParts BraveBrowserMainParts
|
||||
#include "../../../../chrome/browser/chrome_browser_main_win.h" // NOLINT
|
||||
#include "src/chrome/browser/chrome_browser_main_win.h"
|
||||
#undef ChromeBrowserMainParts
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_CHROME_BROWSER_MAIN_WIN_H_
|
||||
|
||||
@@ -25,7 +25,7 @@ bool HandleNewTabURLReverseRewrite(GURL* url, content::BrowserContext* bc) {
|
||||
}
|
||||
} // namespace search
|
||||
|
||||
#include "../../../../chrome/browser/chrome_content_browser_client.cc" // NOLINT
|
||||
#include "src/chrome/browser/chrome_content_browser_client.cc"
|
||||
|
||||
#undef HandleNewTabURLRewrite
|
||||
#undef HandleNewTabURLReverseRewrite_ChromiumImpl
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#define LoadLocalState LoadLocalState_ChromiumImpl
|
||||
#include "../../../../chrome/browser/chrome_resource_bundle_helper.cc"
|
||||
#include "src/chrome/browser/chrome_resource_bundle_helper.cc"
|
||||
#undef LoadLocalState
|
||||
#include "brave/common/resource_bundle_helper.h"
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#define MakeChromeComponentUpdaterConfigurator \
|
||||
MakeChromeComponentUpdaterConfigurator_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/component_updater/chrome_component_updater_configurator.cc" // NOLINT
|
||||
#include "src/chrome/browser/component_updater/chrome_component_updater_configurator.cc"
|
||||
#undef MakeChromeComponentUpdaterConfigurator
|
||||
|
||||
namespace component_updater {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "../../../../../chrome/browser/component_updater/component_updater_utils.cc"
|
||||
#include "src/chrome/browser/component_updater/component_updater_utils.cc"
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "../../../../../chrome/browser/component_updater/component_updater_utils.h"
|
||||
#include "src/chrome/browser/component_updater/component_updater_utils.h"
|
||||
|
||||
namespace component_updater {
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#define RegisterCRLSetComponent RegisterCRLSetComponent_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/component_updater/crl_set_component_installer.cc" // NOLINT
|
||||
#include "src/chrome/browser/component_updater/crl_set_component_installer.cc"
|
||||
#undef RegisterCRLSetComponent
|
||||
|
||||
#include "chrome/browser/browser_process.h"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#define RegisterFileTypePoliciesComponent \
|
||||
RegisterFileTypePoliciesComponent_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/component_updater/file_type_policies_component_installer.cc" // NOLINT
|
||||
#include "src/chrome/browser/component_updater/file_type_policies_component_installer.cc"
|
||||
#undef RegisterFileTypePoliciesComponent
|
||||
|
||||
#include "chrome/browser/component_updater/component_updater_utils.h"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "chrome/browser/component_updater/registration.h"
|
||||
|
||||
#define RegisterComponentsForUpdate RegisterComponentsForUpdate_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/component_updater/registration.cc" // NOLINT
|
||||
#include "src/chrome/browser/component_updater/registration.cc"
|
||||
#undef RegisterComponentsForUpdate
|
||||
|
||||
#include "chrome/browser/browser_process.h"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#define RegisterWidevineCdmComponent RegisterWidevineCdmComponent_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/component_updater/widevine_cdm_component_installer.cc" // NOLINT
|
||||
#include "src/chrome/browser/component_updater/widevine_cdm_component_installer.cc"
|
||||
#undef RegisterWidevineCdmComponent
|
||||
|
||||
#include "brave/browser/widevine/widevine_utils.h"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "brave/browser/content_settings/brave_global_value_map.h"
|
||||
|
||||
#define GlobalValueMap BraveGlobalValueMap
|
||||
#include "../../../../../chrome/browser/content_settings/content_settings_supervised_provider.h"
|
||||
#include "src/chrome/browser/content_settings/content_settings_supervised_provider.h"
|
||||
#undef GlobalValueMap
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_SUPERVISED_PROVIDER_H_
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
#include "brave/browser/profiles/profile_util.h"
|
||||
|
||||
#define BRAVE_BUILD_SERVICE_INSTANCE_FOR brave::IsSessionProfile(profile) ||
|
||||
#include "../../../../../chrome/browser/content_settings/host_content_settings_map_factory.cc"
|
||||
#include "src/chrome/browser/content_settings/host_content_settings_map_factory.cc"
|
||||
#undef BRAVE_BUILD_SERVICE_INSTANCE_FOR
|
||||
|
||||
@@ -71,4 +71,4 @@ std::unique_ptr<BackgroundDownloadService> BuildInMemoryDownloadServiceOverride(
|
||||
|
||||
#define BuildDownloadService BuildDownloadServiceOverride
|
||||
#define BuildInMemoryDownloadService BuildInMemoryDownloadServiceOverride
|
||||
#include "../../../../../chrome/browser/download/background_download_service_factory.cc"
|
||||
#include "src/chrome/browser/download/background_download_service_factory.cc"
|
||||
|
||||
@@ -14,7 +14,7 @@ bool IsIpfsImportDownloadCreated(content::WebContents* web_contents,
|
||||
return; \
|
||||
} \
|
||||
RecordDownloadStartPerProfileType
|
||||
#include "../../../../../chrome/browser/download/download_ui_controller.cc"
|
||||
#include "src/chrome/browser/download/download_ui_controller.cc"
|
||||
#undef RecordDownloadStartPerProfileType
|
||||
|
||||
bool IsIpfsImportDownloadCreated(content::WebContents* web_contents,
|
||||
|
||||
+1
-1
@@ -7,5 +7,5 @@
|
||||
|
||||
#define BRAVE_CREATE_EXTENSION_INFO_HELPER \
|
||||
info->is_split_mode = IncognitoInfo::IsSplitMode(&extension);
|
||||
#include "../../../../../../../chrome/browser/extensions/api/developer_private/extension_info_generator.cc"
|
||||
#include "src/chrome/browser/extensions/api/developer_private/extension_info_generator.cc"
|
||||
#undef BRAVE_CREATE_EXTENSION_INFO_HELPER
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
Dummy(); \
|
||||
virtual const TypedPrefMap& GetAllowlistedKeys
|
||||
|
||||
#include "../../../../../../../chrome/browser/extensions/api/settings_private/prefs_util.h"
|
||||
#include "src/chrome/browser/extensions/api/settings_private/prefs_util.h"
|
||||
#undef GetAllowlistedKeys
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_API_SETTINGS_PRIVATE_PREFS_UTIL_H_
|
||||
|
||||
+1
-1
@@ -6,5 +6,5 @@
|
||||
#include "brave/browser/extensions/api/settings_private/brave_prefs_util.h"
|
||||
|
||||
#define PrefsUtil BravePrefsUtil
|
||||
#include "../../../../../../../chrome/browser/extensions/api/settings_private/settings_private_delegate.cc"
|
||||
#include "src/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc"
|
||||
#undef PrefsUtil
|
||||
|
||||
+1
-1
@@ -6,5 +6,5 @@
|
||||
#include "brave/browser/extensions/api/settings_private/brave_prefs_util.h"
|
||||
|
||||
#define PrefsUtil BravePrefsUtil
|
||||
#include "../../../../../../../chrome/browser/extensions/api/settings_private/settings_private_event_router.cc"
|
||||
#include "src/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc"
|
||||
#undef PrefsUtil
|
||||
|
||||
+1
-1
@@ -8,5 +8,5 @@
|
||||
#define BRAVE_DISABLE_RPH_FROM_REQUEST \
|
||||
*error = "Unsupported"; return nullptr;
|
||||
|
||||
#include "../../../../../../../chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc"
|
||||
#include "src/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc"
|
||||
#undef BRAVE_DISABLE_RPH_FROM_REQUEST
|
||||
|
||||
+1
-1
@@ -39,5 +39,5 @@
|
||||
BRAVE_REWARDS_EXTENSION_RESOURCES \
|
||||
BRAVE_WEBTORRENT_RESOURCES
|
||||
|
||||
#include "../../../../../chrome/browser/extensions/chrome_component_extension_resource_manager.cc"
|
||||
#include "src/chrome/browser/extensions/chrome_component_extension_resource_manager.cc"
|
||||
#undef BRAVE_CHROME_COMPONENT_EXTENSION_RESOURCE_MANAGER_DATA_DATA
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
|
||||
#define BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING() (1)
|
||||
#endif
|
||||
#include "../../../../../chrome/browser/extensions/chrome_content_verifier_delegate.cc"
|
||||
#include "src/chrome/browser/extensions/chrome_content_verifier_delegate.cc"
|
||||
#if defined(OFFICIAL_BUILD)
|
||||
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
|
||||
#endif
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
|
||||
#define ChromeExtensionsAPIClient BraveExtensionsAPIClient
|
||||
#define ChromeUpdateClientConfig BraveUpdateClientConfig
|
||||
#include "../../../../../chrome/browser/extensions/chrome_extensions_browser_client.cc"
|
||||
#include "src/chrome/browser/extensions/chrome_extensions_browser_client.cc"
|
||||
#undef ChromeExtensionsAPIClient
|
||||
#undef ChromeUpdateClientConfig
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#define IsComponentExtensionAllowlisted IsComponentExtensionAllowlisted_ChromiumImpl // NOLINT
|
||||
#include "../../../../../../chrome/browser/extensions/component_extensions_allowlist/allowlist.cc" // NOLINT
|
||||
#include "src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc"
|
||||
#undef IsComponentExtensionAllowlisted
|
||||
|
||||
#include "base/cxx17_backports.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
|
||||
#define GetDialogTitle GetDialogTitle_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/extensions/extension_install_prompt.cc"
|
||||
#include "src/chrome/browser/extensions/extension_install_prompt.cc"
|
||||
#undef GetDialogTitle
|
||||
|
||||
std::u16string ExtensionInstallPrompt::Prompt::GetDialogTitle() const {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
GetDialogTitle_ChromiumImpl() const; \
|
||||
std::u16string GetDialogTitle
|
||||
|
||||
#include "../../../../../chrome/browser/extensions/extension_install_prompt.h"
|
||||
#include "src/chrome/browser/extensions/extension_install_prompt.h"
|
||||
#undef GetDialogTitle
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
#define BRAVE_EXTENSION_MANAGEMENT_FACTORY_BUILD_SERVICE_INSTANCE_FOR \
|
||||
return new BraveExtensionManagement(Profile::FromBrowserContext(context));
|
||||
|
||||
#include "../../../../../chrome/browser/extensions/extension_management.cc"
|
||||
#include "src/chrome/browser/extensions/extension_management.cc"
|
||||
#undef BRAVE_EXTENSION_MANAGEMENT_FACTORY_BUILD_SERVICE_INSTANCE_FOR
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
#include "chrome/browser/extensions/extension_service.h"
|
||||
|
||||
#define ComponentLoader BraveComponentLoader
|
||||
#include "../../../../../chrome/browser/extensions/extension_service.cc"
|
||||
#include "src/chrome/browser/extensions/extension_service.cc"
|
||||
#undef ComponentLoader
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
#include "chrome/browser/extensions/update_install_gate.h"
|
||||
|
||||
#define ExtensionService BraveExtensionService
|
||||
#include "../../../../../chrome/browser/extensions/extension_system_impl.cc"
|
||||
#include "src/chrome/browser/extensions/extension_system_impl.cc"
|
||||
#undef ExtensionService
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
|
||||
#define BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING() (1)
|
||||
#endif
|
||||
#include "../../../../../chrome/browser/extensions/install_verifier.cc"
|
||||
#include "src/chrome/browser/extensions/install_verifier.cc"
|
||||
#if defined(OFFICIAL_BUILD)
|
||||
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
|
||||
#endif
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
public:
|
||||
// #define BRAVE_CHROME_UPDATE_CLIENT_CONFIG_H_
|
||||
|
||||
#include "../../../../../../chrome/browser/extensions/updater/chrome_update_client_config.h"
|
||||
#include "src/chrome/browser/extensions/updater/chrome_update_client_config.h"
|
||||
#undef BRAVE_CHROME_UPDATE_CLIENT_CONFIG_H_
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_EXTENSIONS_UPDATER_CHROME_UPDATE_CLIENT_CONFIG_H_
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "chrome/browser/sync/user_event_service_factory.h"
|
||||
|
||||
#define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/federated_learning/floc_id_provider_factory.cc" // NOLINT
|
||||
#include "src/chrome/browser/federated_learning/floc_id_provider_factory.cc"
|
||||
#undef BuildServiceInstanceFor
|
||||
|
||||
namespace federated_learning {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
BuildServiceInstanceFor_ChromiumImpl(content::BrowserContext* context) \
|
||||
const; \
|
||||
KeyedService* BuildServiceInstanceFor
|
||||
#include "../../../../../chrome/browser/federated_learning/floc_id_provider_factory.h"
|
||||
#include "src/chrome/browser/federated_learning/floc_id_provider_factory.h"
|
||||
#undef BuildServiceInstanceFor
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_FEDERATED_LEARNING_FLOC_ID_PROVIDER_FACTORY_H_
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#define IsMetricsReportingOptIn IsMetricsReportingOptIn_UnUsed
|
||||
#include "../../../../../chrome/browser/first_run/first_run.cc"
|
||||
#include "src/chrome/browser/first_run/first_run.cc"
|
||||
#undef IsMetricsReportingOptIn
|
||||
|
||||
namespace first_run {
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
|
||||
#define BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING() (1)
|
||||
#endif
|
||||
#include "../../../../../chrome/browser/first_run/first_run_internal_posix.cc"
|
||||
#include "src/chrome/browser/first_run/first_run_internal_posix.cc"
|
||||
#if defined(OFFICIAL_BUILD)
|
||||
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
|
||||
#endif
|
||||
|
||||
@@ -40,5 +40,5 @@ const base::Feature* BraveFindFeatureExposedToJava(
|
||||
if (feature) \
|
||||
return feature;
|
||||
|
||||
#include "../../../../../../chrome/browser/flags/android/chrome_feature_list.cc"
|
||||
#include "src/chrome/browser/flags/android/chrome_feature_list.cc"
|
||||
#undef BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#define CanAddURLToHistory CanAddURLToHistory_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/history/history_utils.cc" // NOLINT
|
||||
#include "src/chrome/browser/history/history_utils.cc"
|
||||
#undef CanAddURLToHistory
|
||||
|
||||
#include "brave/browser/ethereum_remote_client/buildflags/buildflags.h"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#define Cancel virtual Cancel
|
||||
#define CloseMojoHandles virtual CloseMojoHandles
|
||||
|
||||
#include "../../../../../chrome/browser/importer/external_process_importer_client.h"
|
||||
#include "src/chrome/browser/importer/external_process_importer_client.h"
|
||||
|
||||
#undef BRAVE_EXTERNAL_PROCESS_IMPORTER_CLIENT_H
|
||||
#undef Start
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
|
||||
#define ExternalProcessImporterClient BraveExternalProcessImporterClient
|
||||
#define InProcessImporterBridge BraveInProcessImporterBridge
|
||||
#include "../../../../../chrome/browser/importer/external_process_importer_host.cc"
|
||||
#include "src/chrome/browser/importer/external_process_importer_host.cc"
|
||||
#undef ExternalProcessImporterClient
|
||||
#undef InProcessImporterBridge
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
friend class BraveExternalProcessImporterHost;
|
||||
|
||||
#define NotifyImportEnded virtual NotifyImportEnded
|
||||
#include "../../../../../chrome/browser/importer/external_process_importer_host.h"
|
||||
#include "src/chrome/browser/importer/external_process_importer_host.h"
|
||||
#undef BRAVE_EXTERNAL_PROCESS_IMPORTER_HOST_H
|
||||
#undef NotifyImportEnded
|
||||
|
||||
|
||||
@@ -73,4 +73,4 @@ void DetectChromeProfiles(std::vector<importer::SourceProfile>* profiles) {
|
||||
|
||||
} // namespace
|
||||
|
||||
#include "../../../../../chrome/browser/importer/importer_list.cc"
|
||||
#include "src/chrome/browser/importer/importer_list.cc"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#define BRAVE_IN_PROCESS_IMPORTER_BRIDGE_H \
|
||||
friend class BraveInProcessImporterBridge;
|
||||
#include "../../../../../chrome/browser/importer/in_process_importer_bridge.h"
|
||||
#include "src/chrome/browser/importer/in_process_importer_bridge.h"
|
||||
#undef BRAVE_IN_PROCESS_IMPORTER_BRIDGE_H
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_IMPORTER_IN_PROCESS_IMPORTER_BRIDGE_H_
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "chrome/browser/autofill/personal_data_manager_factory.h"
|
||||
#include "components/autofill/core/browser/personal_data_manager.h"
|
||||
|
||||
#include "../../../../../chrome/browser/importer/profile_writer.cc"
|
||||
#include "src/chrome/browser/importer/profile_writer.cc"
|
||||
|
||||
void ProfileWriter::AddCreditCard(const std::u16string& name_on_card,
|
||||
const std::u16string& expiration_month,
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
const std::string& origin); \
|
||||
virtual void AddAutofillFormDataEntries
|
||||
|
||||
#include "../../../../../chrome/browser/importer/profile_writer.h"
|
||||
#include "src/chrome/browser/importer/profile_writer.h"
|
||||
|
||||
#undef AddAutofillFormDataEntries
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
|
||||
|
||||
#define MaybeCreateNavigationThrottle MaybeCreateNavigationThrottle_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc"
|
||||
#include "src/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc"
|
||||
#undef MaybeCreateNavigationThrottle
|
||||
|
||||
std::unique_ptr<LookalikeUrlNavigationThrottle>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
static std::unique_ptr<LookalikeUrlNavigationThrottle> \
|
||||
MaybeCreateNavigationThrottle_ChromiumImpl
|
||||
|
||||
#include "../../../../../chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
|
||||
#include "src/chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
|
||||
#undef MaybeCreateNavigationThrottle
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_LOOKALIKES_LOOKALIKE_URL_NAVIGATION_THROTTLE_H_
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#define KeystoneEnabled KeystoneEnabled_ChromiumImpl
|
||||
#define CurrentlyInstalledVersion CurrentlyInstalledVersion_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/mac/keystone_glue.mm" // NOLINT
|
||||
#include "src/chrome/browser/mac/keystone_glue.mm"
|
||||
#undef KeystoneEnabled
|
||||
#undef CurrentlyInstalledVersion
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "content/public/browser/browser_context.h"
|
||||
|
||||
#define MediaRouterEnabled MediaRouterEnabled_ChromiumImpl
|
||||
#include "../../../../../../chrome/browser/media/router/media_router_feature.cc"
|
||||
#include "src/chrome/browser/media/router/media_router_feature.cc"
|
||||
#undef MediaRouterEnabled
|
||||
|
||||
namespace media_router {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "chrome/browser/metrics/chrome_metrics_services_manager_client.h"
|
||||
|
||||
#define IsMetricsReportingEnabled IsMetricsReportingEnabled_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/metrics/chrome_metrics_services_manager_client.cc"
|
||||
#include "src/chrome/browser/metrics/chrome_metrics_services_manager_client.cc"
|
||||
#undef IsMetricsReportingEnabled
|
||||
|
||||
bool ChromeMetricsServicesManagerClient::IsMetricsReportingEnabled() {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#define IsMetricsReportingEnabled IsMetricsReportingEnabled_ChromiumImpl(); \
|
||||
virtual bool IsMetricsReportingEnabled
|
||||
#include "../../../../../chrome/browser/metrics/chrome_metrics_services_manager_client.h"
|
||||
#include "src/chrome/browser/metrics/chrome_metrics_services_manager_client.h"
|
||||
#undef IsMetricsReportingEnabled
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_
|
||||
|
||||
@@ -36,4 +36,4 @@ std::unique_ptr<net::ProxyConfigService> CreateProxyConfigServiceTor(
|
||||
#define BRAVE_PROXY_CONFIG_MONITOR
|
||||
#endif
|
||||
|
||||
#include "../../../../../chrome/browser/net/proxy_config_monitor.cc" // NOLINT
|
||||
#include "src/chrome/browser/net/proxy_config_monitor.cc"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#define BRAVE_PROXY_CONFIG_MONITOR_H \
|
||||
net::ProxyConfigService* GetProxyConfigServiceForTesting() \
|
||||
{ return proxy_config_service_.get(); }
|
||||
#include "../../../../../chrome/browser/net/proxy_config_monitor.h" // NOLINT
|
||||
#include "src/chrome/browser/net/proxy_config_monitor.h"
|
||||
#undef BRAVE_PROXY_CONFIG_MONITOR_H
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_NET_PROXY_CONFIG_MONITOR_H_
|
||||
|
||||
@@ -52,5 +52,5 @@ void AddDoHServers(std::string* doh_templates,
|
||||
AddDoHServers(&doh_templates, local_state_, \
|
||||
force_check_parental_controls_for_automatic_mode);
|
||||
|
||||
#include "../../../../../chrome/browser/net/stub_resolver_config_reader.cc"
|
||||
#include "src/chrome/browser/net/stub_resolver_config_reader.cc"
|
||||
#undef BRAVE_GET_AND_UPDATE_CONFIGURATION
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "brave/services/network/public/cpp/system_request_handler.h"
|
||||
#include "../../../../../chrome/browser/net/system_network_context_manager.cc"
|
||||
#include "src/chrome/browser/net/system_network_context_manager.cc"
|
||||
|
||||
@@ -9,5 +9,5 @@
|
||||
AddNotificationHandler( \
|
||||
NotificationHandler::Type::BRAVE_ADS, \
|
||||
std::make_unique<brave_ads::AdsNotificationHandler>(profile));
|
||||
#include "../../../../../chrome/browser/notifications/notification_display_service_impl.cc"
|
||||
#include "src/chrome/browser/notifications/notification_display_service_impl.cc"
|
||||
#undef BRAVE_ADD_BRAVE_ADS_NOTIFICATION_HANDLER
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
#include "chrome/browser/notifications/notification_handler.h"
|
||||
|
||||
#define NotificationHandler NotificationHandler_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/notifications/notification_handler.cc"
|
||||
#include "src/chrome/browser/notifications/notification_handler.cc"
|
||||
#undef NotificationHandler
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_HANDLER_H_
|
||||
|
||||
#define NotificationHandler NotificationHandler_ChromiumImpl
|
||||
#include "../../../../../chrome/browser/notifications/notification_handler.h"
|
||||
#include "src/chrome/browser/notifications/notification_handler.h"
|
||||
#undef NotificationHandler
|
||||
|
||||
#include "base/check.h"
|
||||
|
||||
@@ -21,5 +21,5 @@ class UnusedClass {
|
||||
|
||||
#define Java_NotificationPlatformBridge_create \
|
||||
Java_BraveNotificationPlatformBridge_create
|
||||
#include "../../../../../chrome/browser/notifications/notification_platform_bridge_android.cc"
|
||||
#include "src/chrome/browser/notifications/notification_platform_bridge_android.cc"
|
||||
#undef Java_NotificationPlatformBridge_create
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
#include "brave/components/ntp_tiles/brave_popular_sites_impl.h"
|
||||
|
||||
#define PopularSitesImpl BravePopularSitesImpl
|
||||
#include "../../../../../chrome/browser/ntp_tiles/chrome_popular_sites_factory.cc" // NOLINT
|
||||
#include "src/chrome/browser/ntp_tiles/chrome_popular_sites_factory.cc"
|
||||
#undef PopularSitesImpl
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#define InitializePageLoadMetricsForWebContents \
|
||||
InitializePageLoadMetricsForWebContents_Chromium
|
||||
#include "../../../../../chrome/browser/page_load_metrics/page_load_metrics_initialize.cc"
|
||||
#include "src/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc"
|
||||
#undef InitializePageLoadMetricsForWebContents
|
||||
|
||||
#include "brave/components/brave_perf_predictor/browser/perf_predictor_page_metrics_observer.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "../../../../../chrome/browser/permissions/chrome_permissions_client.cc"
|
||||
#include "src/chrome/browser/permissions/chrome_permissions_client.cc"
|
||||
|
||||
#include "brave/components/brave_wallet/browser/ethereum_permission_utils.h"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
ContentSettingsType type) override; \
|
||||
bool CanBypassEmbeddingOriginCheck
|
||||
|
||||
#include "../../../../../chrome/browser/permissions/chrome_permissions_client.h"
|
||||
#include "src/chrome/browser/permissions/chrome_permissions_client.h"
|
||||
#undef CanBypassEmbeddingOriginCheck
|
||||
|
||||
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_PERMISSIONS_CHROME_PERMISSIONS_CLIENT_H_
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user