diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index d52268a4576..c32481d384a 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -251,7 +251,7 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api):
source_file_filter = lambda f: input_api.FilterSourceFile(
f,
- files_to_check=[r"^app/theme/.*", r"^build/chromium/resources/.*"],
+ files_to_check=[r"^app/theme/.*"],
files_to_skip=input_api.DEFAULT_FILES_TO_SKIP)
new_sources = []
@@ -274,15 +274,9 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api):
upstream_file = f.replace('/brave_origin/', '/chromium/', 1)
elif '/brave/' in f:
upstream_file = f.replace('/brave/', '/chromium/', 1)
-
- if 'build/chromium/resources/' in f:
- upstream_file = f.replace('build/chromium/resources/', '//', 1)
- elif 'app/theme/' in f:
- upstream_file = f'//chrome/{upstream_file}'
else:
upstream_file = f
-
- path = brave_chromium_utils.wspath(upstream_file)
+ path = brave_chromium_utils.wspath(f'//chrome/{upstream_file}')
if not os.path.exists(path):
problems.append(upstream_file)
@@ -291,8 +285,8 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api):
output_api.PresubmitError(
'Missing upstream theme file to override',
items=sorted(problems),
- long_text='app/theme and build/chromium/resources should only '
- 'be used for overrides of upstream files. Channel-specific '
+ long_text='app/theme should only be used for overrides of '
+ 'upstream theme files in chrome/app/theme. Channel-specific '
'theme assets (e.g., dev/beta/nightly) are exempt.')
]
return []
diff --git a/build/chromium/resources/chrome/android/java/res_template/xml/file_paths.xml b/android/java/res_template/xml/file_paths.xml
similarity index 100%
rename from build/chromium/resources/chrome/android/java/res_template/xml/file_paths.xml
rename to android/java/res_template/xml/file_paths.xml
diff --git a/android/java/res_template/xml/syncadapter.xml b/android/java/res_template/xml/syncadapter.xml
new file mode 100644
index 00000000000..870c92d0e06
--- /dev/null
+++ b/android/java/res_template/xml/syncadapter.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_bookmarks.png b/app/theme/default_100_percent/common/favicon_bookmarks.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_bookmarks.png
rename to app/theme/default_100_percent/common/favicon_bookmarks.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_downloads.png b/app/theme/default_100_percent/common/favicon_downloads.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_downloads.png
rename to app/theme/default_100_percent/common/favicon_downloads.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_ntp.png b/app/theme/default_100_percent/common/favicon_ntp.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_ntp.png
rename to app/theme/default_100_percent/common/favicon_ntp.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_settings.png b/app/theme/default_100_percent/common/favicon_settings.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_settings.png
rename to app/theme/default_100_percent/common/favicon_settings.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png b/app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png
rename to app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png b/app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png
rename to app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder.png b/app/theme/default_100_percent/common/profile_avatar_placeholder.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder.png
rename to app/theme/default_100_percent/common/profile_avatar_placeholder.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder_large.png b/app/theme/default_100_percent/common/profile_avatar_placeholder_large.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder_large.png
rename to app/theme/default_100_percent/common/profile_avatar_placeholder_large.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address.png b/app/theme/default_100_percent/common/save_address.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address.png
rename to app/theme/default_100_percent/common/save_address.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address_dark.png b/app/theme/default_100_percent/common/save_address_dark.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address_dark.png
rename to app/theme/default_100_percent/common/save_address_dark.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card.png b/app/theme/default_100_percent/common/save_card.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card.png
rename to app/theme/default_100_percent/common/save_card.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card_dark.png b/app/theme/default_100_percent/common/save_card_dark.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card_dark.png
rename to app/theme/default_100_percent/common/save_card_dark.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password.png b/app/theme/default_100_percent/common/save_password.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password.png
rename to app/theme/default_100_percent/common/save_password.png
diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password_dark.png b/app/theme/default_100_percent/common/save_password_dark.png
similarity index 100%
rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password_dark.png
rename to app/theme/default_100_percent/common/save_password_dark.png
diff --git a/app/theme/default_100_percent/common/save_password_multi_device.png b/app/theme/default_100_percent/common/save_password_multi_device.png
new file mode 100644
index 00000000000..d884b8a87b7
Binary files /dev/null and b/app/theme/default_100_percent/common/save_password_multi_device.png differ
diff --git a/app/theme/default_100_percent/common/save_password_multi_device_dark.png b/app/theme/default_100_percent/common/save_password_multi_device_dark.png
new file mode 100644
index 00000000000..d884b8a87b7
Binary files /dev/null and b/app/theme/default_100_percent/common/save_password_multi_device_dark.png differ
diff --git a/app/theme/default_100_percent/common/save_password_one_device.png b/app/theme/default_100_percent/common/save_password_one_device.png
new file mode 100644
index 00000000000..d884b8a87b7
Binary files /dev/null and b/app/theme/default_100_percent/common/save_password_one_device.png differ
diff --git a/app/theme/default_100_percent/common/save_password_one_device_dark.png b/app/theme/default_100_percent/common/save_password_one_device_dark.png
new file mode 100644
index 00000000000..d884b8a87b7
Binary files /dev/null and b/app/theme/default_100_percent/common/save_password_one_device_dark.png differ
diff --git a/build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml b/browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml
rename to browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml
diff --git a/build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml b/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml
rename to browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml
diff --git a/build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml b/browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml
rename to browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml
diff --git a/build/chromium/resources/chrome/browser/incognito/android/java/res/layout/incognito_reauth_view.xml b/browser/incognito/android/java/res/layout/incognito_reauth_view.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/incognito/android/java/res/layout/incognito_reauth_view.xml
rename to browser/incognito/android/java/res/layout/incognito_reauth_view.xml
diff --git a/browser/resources/chrome-logo-faded.png b/browser/resources/chrome-logo-faded.png
new file mode 100644
index 00000000000..e860d66657e
Binary files /dev/null and b/browser/resources/chrome-logo-faded.png differ
diff --git a/build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty.svg b/browser/resources/side_panel/reading_list/images/read_later_empty.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty.svg
rename to browser/resources/side_panel/reading_list/images/read_later_empty.svg
diff --git a/build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg b/browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg
rename to browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg
diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner.svg b/browser/resources/signin/images/shared_left_banner.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner.svg
rename to browser/resources/signin/images/shared_left_banner.svg
diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner_dark.svg b/browser/resources/signin/images/shared_left_banner_dark.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner_dark.svg
rename to browser/resources/signin/images/shared_left_banner_dark.svg
diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner.svg b/browser/resources/signin/images/shared_right_banner.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner.svg
rename to browser/resources/signin/images/shared_right_banner.svg
diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner_dark.svg b/browser/resources/signin/images/shared_right_banner_dark.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner_dark.svg
rename to browser/resources/signin/images/shared_right_banner_dark.svg
diff --git a/build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration.svg b/browser/resources/signin/profile_customization/images/profile_customization_illustration.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration.svg
rename to browser/resources/signin/profile_customization/images/profile_customization_illustration.svg
diff --git a/build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg b/browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg
similarity index 100%
rename from build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg
rename to browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg
diff --git a/browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg b/browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg
new file mode 100644
index 00000000000..45653dafe9c
--- /dev/null
+++ b/browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg
@@ -0,0 +1 @@
+
diff --git a/browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg b/browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg
new file mode 100644
index 00000000000..45653dafe9c
--- /dev/null
+++ b/browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg
@@ -0,0 +1 @@
+
diff --git a/browser/resources/signin/profile_picker/images/left_banner_image.svg b/browser/resources/signin/profile_picker/images/left_banner_image.svg
new file mode 100644
index 00000000000..ad79a04b6b5
--- /dev/null
+++ b/browser/resources/signin/profile_picker/images/left_banner_image.svg
@@ -0,0 +1 @@
+
diff --git a/browser/resources/signin/profile_picker/images/right_banner_image.svg b/browser/resources/signin/profile_picker/images/right_banner_image.svg
new file mode 100644
index 00000000000..ad79a04b6b5
--- /dev/null
+++ b/browser/resources/signin/profile_picker/images/right_banner_image.svg
@@ -0,0 +1 @@
+
diff --git a/build/chromium/resources/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml b/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml
rename to browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml
diff --git a/build/chromium/resources/chrome/browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml b/browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml
rename to browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png
rename to browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png
rename to browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png
rename to browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png
rename to browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png
rename to browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png
rename to browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png
diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml b/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml
similarity index 100%
rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml
rename to browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml
diff --git a/build/chromium/resources/README.md b/build/chromium/resources/README.md
deleted file mode 100644
index 199964e99fc..00000000000
--- a/build/chromium/resources/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains resource files that should overwrite upstream. It is for resource files only (jpg, svg, xml, etc...)
diff --git a/build/commands/lib/branding.js b/build/commands/lib/branding.js
index 853a214abcb..c805dd2b465 100644
--- a/build/commands/lib/branding.js
+++ b/build/commands/lib/branding.js
@@ -16,10 +16,15 @@ exports.update = () => {
const braveComponentsDir = path.join(config.braveCoreDir, 'components')
const chromeAppDir = path.join(config.srcDir, 'chrome', 'app')
const braveAppDir = path.join(config.braveCoreDir, 'app')
- const braveChromiumResources = path.join(
+ const chromeBrowserResourcesDir = path.join(
+ config.srcDir,
+ 'chrome',
+ 'browser',
+ 'resources',
+ )
+ const braveBrowserResourcesDir = path.join(
config.braveCoreDir,
- 'build',
- 'chromium',
+ 'browser',
'resources',
)
const braveAppVectorIconsDir = path.join(config.braveCoreDir, 'components')
@@ -118,7 +123,14 @@ exports.update = () => {
])
}
}
- fileMap.add([path.join(braveChromiumResources), path.join(config.srcDir)])
+ fileMap.add([
+ path.join(braveAppDir, 'theme', 'default_100_percent', 'common'),
+ path.join(chromeAppDir, 'theme', 'default_100_percent', 'common'),
+ ])
+ fileMap.add([
+ path.join(braveAppDir, 'theme', 'default_200_percent', 'common'),
+ path.join(chromeAppDir, 'theme', 'default_200_percent', 'common'),
+ ])
// Copy product_logo for version UI (about:version page).
// product_logo_name_48.png is renamed to product_logo.png during copy.
// Use brave_origin logos when is_brave_origin_branded is true.
@@ -159,12 +171,95 @@ exports.update = () => {
),
])
}
+ // Replace history page's favicon.
+ fileMap.add([
+ path.join(
+ braveComponentsDir,
+ 'resources',
+ 'default_100_percent',
+ 'favicon_history.png',
+ ),
+ path.join(
+ chromeComponentsDir,
+ 'resources',
+ 'default_100_percent',
+ 'favicon_history.png',
+ ),
+ ])
+ fileMap.add([
+ path.join(
+ braveComponentsDir,
+ 'resources',
+ 'default_200_percent',
+ 'favicon_history.png',
+ ),
+ path.join(
+ chromeComponentsDir,
+ 'resources',
+ 'default_200_percent',
+ 'favicon_history.png',
+ ),
+ ])
for (const branding of ['brave', 'brave_origin']) {
fileMap.add([
path.join(braveAppVectorIconsDir, 'vector_icons', branding),
path.join(chromeComponentsDir, 'vector_icons', branding),
])
}
+ // Copy chrome-logo-faded.png for replacing chrome logo of welcome page with brave's on Win8.
+ fileMap.add([
+ path.join(braveBrowserResourcesDir, 'chrome-logo-faded.png'),
+ path.join(chromeBrowserResourcesDir, 'chrome-logo-faded.png'),
+ ])
+ fileMap.add([
+ path.join(
+ braveBrowserResourcesDir,
+ 'downloads',
+ 'images',
+ 'incognito_marker.svg',
+ ),
+ path.join(
+ chromeBrowserResourcesDir,
+ 'downloads',
+ 'images',
+ 'incognito_marker.svg',
+ ),
+ ])
+ fileMap.add([
+ path.join(braveBrowserResourcesDir, 'settings', 'images'),
+ path.join(chromeBrowserResourcesDir, 'settings', 'images'),
+ ])
+ fileMap.add([
+ path.join(braveBrowserResourcesDir, 'signin', 'images'),
+ path.join(chromeBrowserResourcesDir, 'signin', 'images'),
+ ])
+ fileMap.add([
+ path.join(
+ braveBrowserResourcesDir,
+ 'signin',
+ 'profile_customization',
+ 'images',
+ ),
+ path.join(
+ chromeBrowserResourcesDir,
+ 'signin',
+ 'profile_customization',
+ 'images',
+ ),
+ ])
+ fileMap.add([
+ path.join(braveBrowserResourcesDir, 'signin', 'profile_picker', 'images'),
+ path.join(chromeBrowserResourcesDir, 'signin', 'profile_picker', 'images'),
+ ])
+ fileMap.add([
+ path.join(braveBrowserResourcesDir, 'side_panel', 'reading_list', 'images'),
+ path.join(
+ chromeBrowserResourcesDir,
+ 'side_panel',
+ 'reading_list',
+ 'images',
+ ),
+ ])
// Copy to make our ${branding_path_product}_behaviors.cc
fileMap.add([
@@ -328,9 +423,6 @@ exports.update = () => {
}
for (let sourceFile of sourceFiles) {
- if (path.basename(sourceFile) === 'README.md') {
- continue
- }
const destinationFile = path.join(
output,
path.relative(source, sourceFile),
@@ -405,15 +497,20 @@ exports.update = () => {
androidIconSet = 'res_brave_nightly'
}
- const androidResSource = path.join(
+ const androidTranslateResSource = path.join(
config.braveCoreDir,
+ 'components',
+ 'translate',
+ 'content',
'android',
'java',
'res',
)
- const androidResDest = path.join(
+ const androidTranslateResDest = path.join(
config.srcDir,
- 'chrome',
+ 'components',
+ 'translate',
+ 'content',
'android',
'java',
'res',
@@ -446,12 +543,246 @@ exports.update = () => {
'java',
'res_chromium_base',
)
+ const androidResSource = path.join(
+ config.braveCoreDir,
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidResDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidResTemplateSource = path.join(
+ config.braveCoreDir,
+ 'android',
+ 'java',
+ 'res_template',
+ )
+ const androidResTemplateDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'android',
+ 'java',
+ 'res_template',
+ )
+ const androidContentPublicResSource = path.join(
+ config.braveCoreDir,
+ 'content',
+ 'public',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidContentPublicResDest = path.join(
+ config.srcDir,
+ 'content',
+ 'public',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidTouchtoFillResSource = path.join(
+ config.braveCoreDir,
+ 'browser',
+ 'touch_to_fill',
+ 'password_manager',
+ 'android',
+ 'internal',
+ 'java',
+ 'res',
+ )
+ const androidTouchtoFillResDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'browser',
+ 'touch_to_fill',
+ 'password_manager',
+ 'android',
+ 'internal',
+ 'java',
+ 'res',
+ )
+ const androidToolbarResSource = path.join(
+ config.braveCoreDir,
+ 'browser',
+ 'ui',
+ 'android',
+ 'toolbar',
+ 'java',
+ 'res',
+ )
+ const androidToolbarResDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'browser',
+ 'ui',
+ 'android',
+ 'toolbar',
+ 'java',
+ 'res',
+ )
+ const androidComponentsWidgetResSource = path.join(
+ config.braveCoreDir,
+ 'components',
+ 'browser_ui',
+ 'widget',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidComponentsWidgetResDest = path.join(
+ config.srcDir,
+ 'components',
+ 'browser_ui',
+ 'widget',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidComponentsStylesResSource = path.join(
+ config.braveCoreDir,
+ 'components',
+ 'browser_ui',
+ 'styles',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidComponentsStylesResDest = path.join(
+ config.srcDir,
+ 'components',
+ 'browser_ui',
+ 'styles',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidSafeBrowsingResSource = path.join(
+ config.braveCoreDir,
+ 'browser',
+ 'safe_browsing',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidSafeBrowsingResDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'browser',
+ 'safe_browsing',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidDownloadInternalResSource = path.join(
+ config.braveCoreDir,
+ 'browser',
+ 'download',
+ 'internal',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidDownloadInternalResDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'browser',
+ 'download',
+ 'internal',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidFeaturesTabUiResSource = path.join(
+ config.braveCoreDir,
+ 'android',
+ 'features',
+ 'tab_ui',
+ 'java',
+ 'res',
+ )
+ const androidFeaturesTabUiDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'android',
+ 'features',
+ 'tab_ui',
+ 'java',
+ 'res',
+ )
+ const androidComponentsOmniboxResSource = path.join(
+ config.braveCoreDir,
+ 'components',
+ 'omnibox',
+ 'browser',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidComponentsOmniboxResDest = path.join(
+ config.srcDir,
+ 'components',
+ 'omnibox',
+ 'browser',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidBrowserPrivateResSource = path.join(
+ config.braveCoreDir,
+ 'browser',
+ 'incognito',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const androidBrowserPrivateResDest = path.join(
+ config.srcDir,
+ 'chrome',
+ 'browser',
+ 'incognito',
+ 'android',
+ 'java',
+ 'res',
+ )
+
+ const uiAndroidResSource = path.join(
+ config.braveCoreDir,
+ 'ui',
+ 'android',
+ 'java',
+ 'res',
+ )
+ const uiAndroidResDest = path.join(
+ config.srcDir,
+ 'ui',
+ 'android',
+ 'java',
+ 'res',
+ )
// Mapping for copying Brave's Android resource into chromium folder.
const copyAndroidResourceMapping = {
- [androidResSource]: [androidResDest],
+ [androidTranslateResSource]: [androidTranslateResDest],
[androidIconSource]: [androidIconDest],
[androidIconBaseSource]: [androidIconBaseDest],
+ [androidResSource]: [androidResDest],
+ [androidResTemplateSource]: [androidResTemplateDest],
+ [androidContentPublicResSource]: [androidContentPublicResDest],
+ [androidTouchtoFillResSource]: [androidTouchtoFillResDest],
+ [androidToolbarResSource]: [androidToolbarResDest],
+ [androidComponentsWidgetResSource]: [androidComponentsWidgetResDest],
+ [androidComponentsStylesResSource]: [androidComponentsStylesResDest],
+ [androidSafeBrowsingResSource]: [androidSafeBrowsingResDest],
+ [androidDownloadInternalResSource]: [androidDownloadInternalResDest],
+ [androidFeaturesTabUiResSource]: [androidFeaturesTabUiDest],
+ [androidComponentsOmniboxResSource]: [androidComponentsOmniboxResDest],
+ [androidBrowserPrivateResSource]: [androidBrowserPrivateResDest],
+ [uiAndroidResSource]: [uiAndroidResDest],
}
console.log('copy Android app icons and app resources')
diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml b/components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml
rename to components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml
diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml b/components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml
rename to components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml
diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml b/components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml
rename to components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml
diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml b/components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml
rename to components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml
diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml b/components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml
rename to components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml b/components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml
rename to components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png
rename to components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png
rename to components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png
rename to components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png
rename to components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png
rename to components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png
diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml b/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml
similarity index 100%
rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml
rename to components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml
diff --git a/build/chromium/resources/components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml b/components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml
similarity index 100%
rename from build/chromium/resources/components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml
rename to components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml
diff --git a/build/chromium/resources/components/resources/default_100_percent/favicon_history.png b/components/resources/default_100_percent/favicon_history.png
similarity index 100%
rename from build/chromium/resources/components/resources/default_100_percent/favicon_history.png
rename to components/resources/default_100_percent/favicon_history.png
diff --git a/build/chromium/resources/components/resources/default_200_percent/favicon_history.png b/components/resources/default_200_percent/favicon_history.png
similarity index 100%
rename from build/chromium/resources/components/resources/default_200_percent/favicon_history.png
rename to components/resources/default_200_percent/favicon_history.png
diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png
similarity index 100%
rename from build/chromium/resources/components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png
rename to components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png
diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png
similarity index 100%
rename from build/chromium/resources/components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png
rename to components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png
diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png
similarity index 100%
rename from build/chromium/resources/components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png
rename to components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png
diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png
similarity index 100%
rename from build/chromium/resources/components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png
rename to components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png
diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png
similarity index 100%
rename from build/chromium/resources/components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png
rename to components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png
diff --git a/build/chromium/resources/content/public/android/java/res/drawable-hdpi/ic_search.png b/content/public/android/java/res/drawable-hdpi/ic_search.png
similarity index 100%
rename from build/chromium/resources/content/public/android/java/res/drawable-hdpi/ic_search.png
rename to content/public/android/java/res/drawable-hdpi/ic_search.png
diff --git a/build/chromium/resources/content/public/android/java/res/drawable-mdpi/ic_search.png b/content/public/android/java/res/drawable-mdpi/ic_search.png
similarity index 100%
rename from build/chromium/resources/content/public/android/java/res/drawable-mdpi/ic_search.png
rename to content/public/android/java/res/drawable-mdpi/ic_search.png
diff --git a/build/chromium/resources/content/public/android/java/res/drawable-xhdpi/ic_search.png b/content/public/android/java/res/drawable-xhdpi/ic_search.png
similarity index 100%
rename from build/chromium/resources/content/public/android/java/res/drawable-xhdpi/ic_search.png
rename to content/public/android/java/res/drawable-xhdpi/ic_search.png
diff --git a/build/chromium/resources/content/public/android/java/res/drawable-xxhdpi/ic_search.png b/content/public/android/java/res/drawable-xxhdpi/ic_search.png
similarity index 100%
rename from build/chromium/resources/content/public/android/java/res/drawable-xxhdpi/ic_search.png
rename to content/public/android/java/res/drawable-xxhdpi/ic_search.png
diff --git a/build/chromium/resources/content/public/android/java/res/drawable-xxxhdpi/ic_search.png b/content/public/android/java/res/drawable-xxxhdpi/ic_search.png
similarity index 100%
rename from build/chromium/resources/content/public/android/java/res/drawable-xxxhdpi/ic_search.png
rename to content/public/android/java/res/drawable-xxxhdpi/ic_search.png
diff --git a/build/chromium/resources/ui/android/java/res/drawable-hdpi/btn_close.png b/ui/android/java/res/drawable-hdpi/btn_close.png
similarity index 100%
rename from build/chromium/resources/ui/android/java/res/drawable-hdpi/btn_close.png
rename to ui/android/java/res/drawable-hdpi/btn_close.png
diff --git a/build/chromium/resources/ui/android/java/res/drawable-mdpi/btn_close.png b/ui/android/java/res/drawable-mdpi/btn_close.png
similarity index 100%
rename from build/chromium/resources/ui/android/java/res/drawable-mdpi/btn_close.png
rename to ui/android/java/res/drawable-mdpi/btn_close.png
diff --git a/build/chromium/resources/ui/android/java/res/drawable-xhdpi/btn_close.png b/ui/android/java/res/drawable-xhdpi/btn_close.png
similarity index 100%
rename from build/chromium/resources/ui/android/java/res/drawable-xhdpi/btn_close.png
rename to ui/android/java/res/drawable-xhdpi/btn_close.png
diff --git a/build/chromium/resources/ui/android/java/res/drawable-xxhdpi/btn_close.png b/ui/android/java/res/drawable-xxhdpi/btn_close.png
similarity index 100%
rename from build/chromium/resources/ui/android/java/res/drawable-xxhdpi/btn_close.png
rename to ui/android/java/res/drawable-xxhdpi/btn_close.png
diff --git a/build/chromium/resources/ui/android/java/res/drawable-xxxhdpi/btn_close.png b/ui/android/java/res/drawable-xxxhdpi/btn_close.png
similarity index 100%
rename from build/chromium/resources/ui/android/java/res/drawable-xxxhdpi/btn_close.png
rename to ui/android/java/res/drawable-xxxhdpi/btn_close.png