diff options
Diffstat (limited to 'chromium/chrome/android')
| -rw-r--r-- | chromium/chrome/android/BUILD.gn | 67 | ||||
| -rw-r--r-- | chromium/chrome/android/chrome_public_apk_tmpl.gni | 25 | ||||
| -rw-r--r-- | chromium/chrome/android/feed/feed_java_sources.gni | 3 | ||||
| -rw-r--r-- | chromium/chrome/android/java/strings/android_chrome_strings.grd | 258 | ||||
| -rw-r--r-- | chromium/chrome/android/java_sources.gni | 157 | ||||
| -rw-r--r-- | chromium/chrome/android/webapk/shell_apk/BUILD.gn | 16 | ||||
| -rw-r--r-- | chromium/chrome/android/webapk/shell_apk/http_manifest_config.json | 34 | ||||
| -rw-r--r-- | chromium/chrome/android/webapk/shell_apk/shell_apk_version.gni | 2 |
8 files changed, 421 insertions, 141 deletions
diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn index 89f8120669b..389cdcac5ab 100644 --- a/chromium/chrome/android/BUILD.gn +++ b/chromium/chrome/android/BUILD.gn @@ -201,7 +201,6 @@ android_library("chrome_java") { "$google_play_services_package:google_play_services_cast_java", "$google_play_services_package:google_play_services_gcm_java", "$google_play_services_package:google_play_services_iid_java", - "$google_play_services_package:google_play_services_nearby_java", "$google_play_services_package:google_play_services_tasks_java", "//base:base_java", "//chrome/android/third_party/compositor_animator:compositor_animator_java", @@ -311,6 +310,7 @@ android_library("chrome_java") { "//components/browsing_data/core:browsing_data_utils_java", "//components/browsing_data/core:clear_browsing_data_tab_java", "//components/consent_auditor:consent_auditor_java", + "//components/data_reduction_proxy/core/browser:data_reduction_proxy_savings_cleared_enum_java", "//components/favicon_base:favicon_base_enums_java", "//components/dom_distiller/core:distiller_type_java", "//components/infobars/core:infobar_enums_java", @@ -369,6 +369,7 @@ action("chrome_android_java_google_api_keys_srcjar") { java_cpp_enum("chrome_android_java_enums_srcjar") { sources = [ + "//chrome/browser/android/digital_asset_links/digital_asset_links_handler.h", "//chrome/browser/android/feedback/connectivity_checker.cc", "//chrome/browser/android/policy/policy_auditor.cc", "//chrome/browser/android/shortcut_info.h", @@ -392,6 +393,7 @@ java_cpp_enum("chrome_vr_android_java_enums_srcjar") { "//chrome/browser/android/vr/vr_shell_delegate.h", "//chrome/browser/vr/metrics/session_metrics_helper.h", "//chrome/browser/vr/text_edit_action.h", + "//chrome/browser/vr/ui_test_input.h", "//chrome/browser/vr/ui_unsupported_mode.h", ] } @@ -527,6 +529,7 @@ android_library("chrome_test_java") { "//chrome/android/webapk/libs/client:client_java", "//chrome/android/webapk/libs/common:common_java", "//chrome/test/android:chrome_java_test_support", + "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java", "//components/autofill/android:autofill_java", "//components/background_task_scheduler:background_task_scheduler_java", "//components/background_task_scheduler:background_task_scheduler_javatests", @@ -648,6 +651,7 @@ if (enable_vr) { "javatests/src/org/chromium/chrome/browser/vr_shell/rules/VrTestRule.java", "javatests/src/org/chromium/chrome/browser/vr_shell/rules/WebappActivityVrTestRule.java", "javatests/src/org/chromium/chrome/browser/vr_shell/util/HeadTrackingUtils.java", + "javatests/src/org/chromium/chrome/browser/vr_shell/util/NativeUiUtils.java", "javatests/src/org/chromium/chrome/browser/vr_shell/util/NfcSimUtils.java", "javatests/src/org/chromium/chrome/browser/vr_shell/util/TransitionUtils.java", "javatests/src/org/chromium/chrome/browser/vr_shell/util/VrInfoBarUtils.java", @@ -769,9 +773,11 @@ android_assets("chrome_public_pak_assets") { # This target is separate from chrome_public_pak_assets because it does not # disable compression. android_assets("chrome_public_locale_pak_assets") { - sources = [] + renaming_sources = [] + renaming_destinations = [] foreach(_locale, locales - android_chrome_omitted_locales) { - sources += [ "$root_out_dir/locales/$_locale.pak" ] + renaming_sources += [ "$root_out_dir/locales/$_locale.pak" ] + renaming_destinations += [ "locales/$_locale.pak" ] } treat_as_locale_paks = true @@ -815,14 +821,6 @@ template("chrome_shared_library") { "//chrome:chrome_android_core", ] - if (enable_vr) { - # Ensure libgvr static library appears before gcc library in linking order. - # See https://crbug.com/704305 for details. - libs = [ - "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", - ] - } - if (use_order_profiling) { deps += [ "//tools/cygprofile" ] } @@ -856,15 +854,12 @@ chrome_shared_library("libchromefortest") { sources = [ "../app/android/chrome_main_delegate_android_initializer.cc", "../browser/android/chrome_entry_point_for_test.cc", - "../browser/profiling_host/profiling_test_driver.cc", - "../browser/profiling_host/profiling_test_driver.h", - "../browser/profiling_host/test_android_shim.cc", - "../browser/profiling_host/test_android_shim.h", ] deps = [ ":chrome_jni_for_test_registration($default_toolchain)", "//base/test:test_support", - "//chrome/browser/profiling_host:jni_headers", + "//components/heap_profiling:test_support", + "//content/public/test/android:content_native_test_support", ] } @@ -988,9 +983,12 @@ if (current_toolchain == default_toolchain) { # This target is separate from monochrome_pak_assets because it does not # disable compression. android_assets("monochrome_locale_pak_assets") { - sources = [] + renaming_sources = [] + renaming_destinations = [] foreach(_locale, locales - android_chrome_omitted_locales) { - sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ] + renaming_sources += + [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ] + renaming_destinations += [ "locales/$_locale.pak" ] } treat_as_locale_paks = true @@ -1030,17 +1028,10 @@ if (!android_64bit_target_cpu || ] deps = [ "//android_webview:common", + "//build/config:exe_and_shlib_deps", "//chrome:chrome_android_core", ] - if (enable_vr) { - # Ensure libgvr static library appears before gcc library in linking order. - # See https://crbug.com/704305 for details. - libs = [ - "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", - ] - } - configs -= [ "//build/config/android:hide_all_but_jni_onload" ] configs += [ "//build/config/android:hide_all_but_jni" ] if (use_lld) { @@ -1082,12 +1073,6 @@ shared_library("chrome_sync_shell") { "//components/sync", "//components/sync:test_support_fake_server_android", ] - if (enable_vr) { - # Ensure libgvr static library appears before gcc library in linking order. - # See https://crbug.com/704305 for details. - libs = - [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] - } if (chromium_linker_supported && use_lld) { configs += [ "//build/config/android:lld_pack_relocations" ] } @@ -1140,8 +1125,10 @@ chrome_public_apk_tmpl_shared("chrome_public_apk_for_test") { shared_library_for_unwind_asset = "chromefortest" } deps = [ - "//chrome/browser/profiling_host:profiling_host_java_test_support", + "//components/heap_profiling:heap_profiling_java_test_support", + "//content/public/test/android:content_java_test_support", ] + deps += android_extra_test_deps } chrome_public_apk_tmpl_shared("chrome_modern_public_apk") { @@ -1272,7 +1259,7 @@ instrumentation_test_apk("chrome_public_test_apk") { additional_apks = [ "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service", - "//chrome/android/webapk/shell_apk:webapk", + "//chrome/android/webapk/shell_apk:http_webapk", "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk", "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk", "//net/android:net_test_support_apk", @@ -1300,6 +1287,7 @@ if (enable_vr) { deps = [ ":chrome_test_vr_java", ] + deps += android_extra_test_deps additional_apks = [ "//net/android:net_test_support_apk" ] proguard_enabled = !is_java_debug if (proguard_enabled && !enable_proguard_obfuscation) { @@ -1307,6 +1295,11 @@ if (enable_vr) { proguard_config_exclusions = [ "//base/android/proguard/disable_chromium_obfuscation.flags" ] } + + # The test APK contains code from both the APK under test and the + # test APK when proguard is enabled. That causes this APK to exceed + # the dex limit. + enable_multidex = proguard_enabled } android_apk("vr_nfc_simulator_apk") { @@ -1368,12 +1361,18 @@ instrumentation_test_apk("chrome_sync_shell_test_apk") { "//third_party/junit", "//ui/android:ui_java", ] + deps += android_extra_test_deps proguard_enabled = !is_java_debug if (proguard_enabled && !enable_proguard_obfuscation) { proguard_configs = [ "//base/android/proguard/enable_obfuscation.flags" ] proguard_config_exclusions = [ "//base/android/proguard/disable_chromium_obfuscation.flags" ] } + + # The test APK contains code from both the APK under test and the + # test APK when proguard is enabled. That causes this APK to exceed + # the dex limit. + enable_multidex = proguard_enabled } if (defined(expected_static_initializer_count)) { diff --git a/chromium/chrome/android/chrome_public_apk_tmpl.gni b/chromium/chrome/android/chrome_public_apk_tmpl.gni index f36d654d943..6bc8cdd580d 100644 --- a/chromium/chrome/android/chrome_public_apk_tmpl.gni +++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni @@ -8,6 +8,7 @@ import("//build/config/locales.gni") import("//build/config/android/extract_unwind_tables.gni") import("//build/config/compiler/compiler.gni") import("//chrome/common/features.gni") +import("//device/vr/buildflags/buildflags.gni") import("//third_party/leakcanary/config.gni") import("channel.gni") @@ -21,6 +22,7 @@ declare_args() { default_chrome_public_jinja_variables = [ "channel=$android_channel", + "enable_arcore=$enable_arcore", "enable_leakcanary=$enable_leakcanary", "enable_vr=$enable_vr", ] @@ -56,10 +58,13 @@ template("chrome_public_apk_tmpl") { "*ic_file_download_white*", # Bottom edge seems misaligned. "*ic_lock.*", # Bottom edge seems misaligned. ] - _native_lib_file = - rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) - native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" - native_lib_version_rule = "//build/util:chrome_version_json" + + if (defined(shared_libraries) && shared_libraries != []) { + _native_lib_file = + rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) + native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" + native_lib_version_rule = "//build/util:chrome_version_json" + } if (!defined(aapt_locale_whitelist)) { aapt_locale_whitelist = locales - android_chrome_omitted_locales } @@ -139,7 +144,7 @@ template("monochrome_public_apk_tmpl") { [ "//chrome/android:monochrome_secondary_abi_lib" ] } - alternative_android_sdk_jar = webview_framework_jar + alternative_android_sdk_dep = webview_framework_dep app_as_shared_lib = true use_chromium_linker = false requires_sdk_api_level_23 = true @@ -193,5 +198,15 @@ template("monochrome_public_apk_tmpl") { proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] png_to_webp = true } + + if (enable_arcore) { + deps += [ "//third_party/arcore-android-sdk:libdynamite_client_java" ] + } + if (package_arcore) { + deps += [ "//third_party/arcore-android-sdk:libarcore_library" ] + + # We store this as a separate .so in the APK and only load as needed. + loadable_modules = [ "${root_out_dir}/libarcore_sdk_c_minimal.so" ] + } } } diff --git a/chromium/chrome/android/feed/feed_java_sources.gni b/chromium/chrome/android/feed/feed_java_sources.gni index 691366e5063..95ba969b923 100644 --- a/chromium/chrome/android/feed/feed_java_sources.gni +++ b/chromium/chrome/android/feed/feed_java_sources.gni @@ -9,6 +9,9 @@ if (enable_feed_in_chrome) { feed_deps = [ "//third_party/feed:feed_lib_java" ] feed_java_sources = [ + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedImageLoader.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedImageLoaderBridge.java", + "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNetworkBridge.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java", "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/action/FeedActionHandler.java", ] diff --git a/chromium/chrome/android/java/strings/android_chrome_strings.grd b/chromium/chrome/android/java/strings/android_chrome_strings.grd index 59175be9573..0ba1df84a09 100644 --- a/chromium/chrome/android/java/strings/android_chrome_strings.grd +++ b/chromium/chrome/android/java/strings/android_chrome_strings.grd @@ -134,9 +134,6 @@ CHAR-LIMIT guidelines: <message name="IDS_OK_GOT_IT" desc="Label of a button by which the user confirms that they read and understood the information or instructions. Used in multiple contexts. [CHAR-LIMIT=20]"> OK, got it </message> - <message name="IDS_GOT_IT" desc="Label of a button by which the user confirms that they read and understood the information or instructions. Used in multiple contexts. [CHAR-LIMIT=20]"> - Got it - </message> <message name="IDS_CANCEL" desc="Label for a cancel button. Used in multiple contexts. [CHAR-LIMIT=20]"> Cancel </message> @@ -553,6 +550,14 @@ CHAR-LIMIT guidelines: Open this page </message> + <!-- Startup page preferences --> + <message name="IDS_OPTIONS_STARTUP_PAGE_TITLE" desc="The title of the setting that allows users to manage the page that opens when they start Chrome."> + Startup Page + </message> + <message name="IDS_OPTIONS_STARTUP_PAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL of the page that opens when they start Chrome."> + Edit startup page + </message> + <!-- Notifications preferences --> <message name="IDS_PREFS_NOTIFICATIONS" desc="Title for Notification preferences."> Notifications @@ -617,15 +622,15 @@ CHAR-LIMIT guidelines: Preload pages for faster loading and offline reading </message> <message name="IDS_CONTEXTUAL_SEARCH_TITLE" desc="Name for the Contextual Search feature, which allows users to search for a term in a web page by tapping on it."> - Touch to Search + Tap to Search </message> <message name="IDS_CONTEXTUAL_SEARCH_DESCRIPTION" desc="Description for Contextual Search preference"> - Learn about topics on websites without leaving the page. Touch to Search sends a word and its surrounding context to Google Search, returning definitions, pictures, search results, and other details. + Learn about topics on websites without leaving the page. Tap to Search sends a word and its surrounding context to Google Search, returning definitions, pictures, search results, and other details. -To adjust your search term, long press to select. To refine your search, slide the panel all the way up and touch the search box. +To adjust your search term, long press to select. To refine your search, slide the panel all the way up and tap the search box. </message> - <message name="IDS_CONTEXTUAL_SEARCH_SHORT_DESCRIPTION" desc="A promo message shown to users who have Touch to Search enabled to explain the new behavior and provide an option to opt out"> - Touch to Search sends the selected word and the current page as context to Google Search. You can turn it off in <ph name="BEGIN_LINK"><link></ph>Settings<ph name="END_LINK"></link></ph>. + <message name="IDS_CONTEXTUAL_SEARCH_SHORT_DESCRIPTION" desc="A promo message shown to users who have Tap to Search enabled to explain the new behavior and provide an option to opt out"> + Tap to Search sends the selected word and the current page as context to Google Search. You can turn it off in <ph name="BEGIN_LINK"><link></ph>Settings<ph name="END_LINK"></link></ph>. </message> <message name="IDS_CONTEXTUAL_SEARCH_ALLOW_BUTTON" desc="A button to confirm and dismiss opt out promo"> Allow @@ -641,6 +646,9 @@ To adjust your search term, long press to select. To refine your search, slide t For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics. </message> + <message name="IDS_CAN_MAKE_PAYMENT_TITLE" desc="Title for preference to allow websites to know whether you have payment methods available through PaymentRequest.CanMakePayment interface"> + Access payment methods + </message> <message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Title of the Clear Browsing Data screen. [CHAR-LIMIT=32]"> Clear browsing data </message> @@ -798,8 +806,8 @@ Your Google account may have other forms of browsing history like searches and a <message name="IDS_MEDIA_PERMISSION_TITLE" desc="Title of the menu containing the media permissions [CHAR-LIMIT=32]"> Media </message> - <message name="IDS_POPUP_PERMISSION_TITLE" desc="Title of the permission to display pop-up windows [CHAR-LIMIT=32]"> - Pop-ups + <message name="IDS_POPUP_PERMISSION_TITLE" desc="Title of the permission to display pop-up windows and redirects [CHAR-LIMIT=32]"> + Pop-ups and redirects </message> <message name="IDS_PUSH_NOTIFICATIONS_PERMISSION_TITLE" desc="Title for the permission for showing push notifications [CHAR-LIMIT=32]"> Notifications @@ -927,8 +935,14 @@ Your Google account may have other forms of browsing history like searches and a <message name="IDS_WEBSITE_SETTINGS_CATEGORY_SOUND_BLOCKED_LIST" desc="Summary text explaining that the sound permission is set to mute sound on some sites. To be shown in the list of permission categories."> Muted </message> - <message name="IDS_WEBSITE_SETTINGS_CATEGORY_POPUPS_BLOCKED" desc="Summary text explaining that sites are blocked from showing popups and that it is the recommended setting."> - Block sites from showing pop-ups (recommended) + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_USB_ASK" desc="Summary text explaining that the USB permission is set to ask the user for permission to access individual devices. To be shown in the list of permission categories."> + Ask before allowing sites to connect to a device (recommended) + </message> + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_USB_BLOCKED" desc="Summary text explaining that the USB permission is set to block all requests for access to devices. To be shown in the list of permission categories."> + Block sites from connecting to devices + </message> + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_POPUPS_REDIRECTS_BLOCKED" desc="Summary text explaining that sites are blocked from showing popups/redirects and that it is the recommended setting."> + Block sites from showing pop-ups and redirects (recommended) </message> <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ADS_BLOCKED" desc="Summary text explaining that ads are being blocked on some sites."> Block ads from sites that tend to show intrusive ads @@ -1095,9 +1109,6 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_WEBSITE_SETTINGS_REVOKE_DEVICE_PERMISSION" desc="Content description for revoking a website's permission to access a device."> Revoke device permission </message> - <message name="IDS_WEBSITE_SETTINGS_USB_NO_DEVICES" desc="Empty list text for a list of USB devices that sites have been granted access to."> - No USB devices here - </message> <!-- Data Saver --> <message name="IDS_DATA_REDUCTION_TITLE" desc="Menu item for Data Saver, which allows users to save mobile data by compressing network traffic."> @@ -1121,18 +1132,36 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_DATA_REDUCTION_USAGE_LABEL" desc="Data Reduction statistics label that states the amount of data that was used by Chrome when Data Saver is enabled."> data used </message> - <message name="IDS_DATA_REDUCTION_PROXY_UNREACHABLE_WARN" desc="Warning message shown when Google data reduction proxy servers are not reachable."> - Chrome is unable to reach Google servers for data compression. Your data savings may be limited. + <message name="IDS_DATA_REDUCTION_START_DATE_CONTENT_DESCRIPTION" desc="This label is used in the device screen reader to describe the starting date that data savings are computed from. This will always be used in the form 'Start date: February 28'."> + Start date <ph name="date">%1$s<ex>Feb 28</ex></ph> + </message> + <message name="IDS_DATA_REDUCTION_END_DATE_CONTENT_DESCRIPTION" desc="This label is used in the device screen reader to describe the end date that data savings are computed until. This will always be used in the form 'End date: February 28'.."> + End date <ph name="date">%1$s<ex>Feb 28</ex></ph> </message> <message name="IDS_DATA_REDUCTION_BREAKDOWN_SITE_TITLE" desc="Title for the sites column on the Data Reduction statistics page. The breakdown lists the top ten sites with the greatest amount of data usage or mobile data that was saved."> Site </message> + <message name="IDS_DATA_REDUCTION_BREAKDOWN_SITE_HEADER_CONTENT_DESCRIPTION" desc="This label is used to state that by clicking the associated button, the displayed table will be sorted by website domain name. This is used in the device's screen reader and is not displayed visually to the user."> + Sort by site + </message> <message name="IDS_DATA_REDUCTION_BREAKDOWN_USED_TITLE" desc="Title for the data used column on the Data Reduction statistics page. The breakdown lists the top ten sites with the greatest amount of data usage or mobile data that was saved."> Used </message> + <message name="IDS_DATA_REDUCTION_BREAKDOWN_USED_HEADER_CONTENT_DESCRIPTION" desc="This label is used to state that by clicking the associated button, the displayed table will be sorted descending by the amount of mobile data that was used when viewing a webpage. This is used in the device's screen reader and is not displayed visually to the user."> + Sort by amount of data used + </message> <message name="IDS_DATA_REDUCTION_BREAKDOWN_SAVED_TITLE" desc="Title for the data saved column on the Data Reduction statistics page. The breakdown lists for the top ten sites with the greatest amount of data usage or mobile data that was saved. Data Saver allows users to to reduce their mobile data usage by compressing network traffic."> Saved </message> + <message name="IDS_DATA_REDUCTION_BREAKDOWN_SAVED_HEADER_CONTENT_DESCRIPTION" desc="This label is used to state that by clicking the associated button, the displayed table will be sorted descending by the amount of mobile data that was saved when viewing a webpage by using Chrome's Data Saver feature. This is used in the device's screen reader and is not displayed visually to the user."> + Sort by amount of data saved + </message> + <message name="IDS_DATA_REDUCTION_BREAKDOWN_USED_CONTENT_DESCRIPTION" desc="This label is used as a suffix to describe the amount of mobile data that was used to view a webpage. It is used in the form '0 bytes used'."> + <ph name="amount">%1$s<ex>0 bytes</ex></ph> used + </message> + <message name="IDS_DATA_REDUCTION_BREAKDOWN_SAVED_CONTENT_DESCRIPTION" desc="This label is used as a suffix to describe the amount of mobile data that was saved when viewing a webpage by using Chrome's Data Saver feature. It is used in the form '0 bytes used'."> + <ph name="amount">%1$s<ex>0 bytes</ex></ph> saved + </message> <message name="IDS_DATA_REDUCTION_BREAKDOWN_REMAINING_SITES_LABEL" desc="Title for the the remaining sites on the Data Reduction statistics page. The breakdown lists the top ten sites with the greatest amount of data usage or mobile data that was saved and then groups the remaining sites together."> Remaining sites (<ph name="NUMBER_OF_SITES">%1$d<ex>35</ex></ph>) </message> @@ -1196,7 +1225,7 @@ To obtain new licenses, connect to the internet and play your downloaded content View </message> - <!-- Downloads preferences --> + <!-- Downloads location --> <message name="IDS_DOWNLOADS_LOCATION_SELECTOR_TITLE" desc="Title of the preference that allows the user to select which of the folders they would like to make the default location to save their downloads."> Download location </message> @@ -1227,14 +1256,26 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_DOWNLOAD_LOCATION_NAME_TOO_LONG" desc="Subtitle for download location dialog in the case that the file needs to be renamed because the name is too long."> File name too long </message> - <message name="IDS_DOWNLOAD_LOCATION_NOT_ENOUGH_SPACE" desc="Text on download location dialog in the case that there is not enough space in the chosen location."> + <message name="IDS_DOWNLOAD_LOCATION_NOT_ENOUGH_SPACE" desc="Text on download location dialog and error notification in the case that there is not enough space in the chosen location."> Not enough space </message> + <message name="IDS_DOWNLOAD_LOCATION_NOT_ENOUGH_SPACE_SD_CARD_FULL" desc="Text on download location error notification in the case that there is not enough space on SD card."> + Not enough space on SD card + </message> <message name="IDS_DOWNLOAD_LOCATION_DOWNLOAD_TO_DEFAULT_FOLDER" desc="Subtitle for download location dialog in the case that the download location the user had originally selected is full or not found. We automatically revert back to the default download location and ask the user to confirm that this is ok."> Download to default folder? </message> - <message name="IDS_DOWNLOAD_LOCATION_NO_SD_CARD" desc="Title for download location dialog in the case that the SD card is not found."> - No SD card found + <message name="IDS_DOWNLOAD_LOCATION_NO_SD_CARD" desc="Title for download location dialog and error notification in the case that the SD card is not found."> + SD card not found + </message> + <message name="IDS_DOWNLOAD_LOCATION_NO_SD_CARD_SNACKBAR" desc="Text for the snackbar that shows up in downloads home to let the user know that since the SD card is not found, some of the files may be missing."> + SD card not found. Some of your files may be missing. + </message> + <message name="IDS_DOWNLOAD_LOCATION_NO_AVAILABLE_LOCATIONS" desc="Text that indicates to the user that there are no download locations available."> + No available download locations + </message> + <message name="IDS_DOWNLOAD_LOCATION_NOTIFICATION_RETRY" desc="Text on download location error notification button, to let the user retry the download."> + Retry </message> <!-- About Chrome preferences --> @@ -1672,6 +1713,43 @@ To obtain new licenses, connect to the internet and play your downloaded content Download </message> + <!-- DownloadProgressInfoBar --> + <message name="IDS_DOWNLOAD_INFOBAR_SPEEDING_UP_DOWNLOAD" desc="InfoBar text describing that the download is being accelerated by chrome"> + Speeding up your download. + </message> + <message name="IDS_DOWNLOAD_INFOBAR_DOWNLOADING_FILES" desc="InfoBar text describing that chrome is downloading one or more files"> + {FILE_COUNT, plural, + =1 {Downloading file.} + other {Downloading # files.}} + </message> + <message name="IDS_DOWNLOADING_MULTIPLE_FILES_WITH_BYTES" desc="InfoBar text describing that chrome is downloading multiple files along with the total size of the files being downloaded"> + Downloading <ph name="count">%1$d<ex>2</ex></ph> files (<ph name="megabytes">%2$s<ex>100</ex></ph>). + </message> + <message name="IDS_DOWNLOADING_FILE_WITH_BYTES" desc="Label describing that file download is in progress along with the total size information"> + Downloading file (<ph name="megabytes">%1$s<ex>100</ex></ph>). + </message> + <message name="IDS_MULTIPLE_DOWNLOAD_COMPLETE" desc="Label describing that one or more downloads have completed"> + {FILE_COUNT, plural, + =1 {1 download complete.} + other {# downloads complete.}} + </message> + <message name="IDS_MULTIPLE_DOWNLOAD_FAILED" desc="Label describing that one or more downloads have failed"> + {FILE_COUNT, plural, + =1 {1 download failed.} + other {# downloads failed.}} + </message> + <message name="IDS_MULTIPLE_DOWNLOAD_PENDING" desc="Label describing that one or more downloads are pending"> + {FILE_COUNT, plural, + =1 {1 download pending.} + other {# downloads pending.}} + </message> + <message name="IDS_DOWNLOAD_INFOBAR_FILENAME" desc="Label showing the file name that just finished downloading"> + <ph name="FILE_NAME">%1$s<ex>abc.png</ex></ph>. + </message> + <message name="IDS_DOWNLOAD_INFOBAR_ACCESSIBILITY_MESSAGE_WITH_LINK" desc="InfoBar accessibility text describing the link on the download progress infobar"> + <ph name="MESSAGE">%1$s<ex>Downloading file (200 MB)</ex></ph> <ph name="LINK_NAME">%2$s<ex>Details</ex></ph> button + </message> + <!-- TranslateInfoBar --> <message name="IDS_TRANSLATE_INFOBAR_ERROR"> Oops. This page could not be translated. @@ -1945,7 +2023,7 @@ To obtain new licenses, connect to the internet and play your downloaded content Added to Home screen </message> - <!-- PageInfoPopup (PageInfo dialog) --> + <!-- Page info popup --> <message name="IDS_PAGE_INFO_SITE_SETTINGS_BUTTON" desc="Text in the button that opens a website's Site Settings from the Page Info dialog."> Site Settings </message> @@ -2021,6 +2099,9 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_DOWNLOAD_NOTIFICATION_COMPLETED" desc="Download notification to be displayed when a download completes."> Download complete </message> + <message name="IDS_DOWNLOAD_NOTIFICATION_COMPLETED_WITH_SIZE" desc="Download notification to be displayed when a download completes, includes the size of the download as well after a separator character."> + Download complete <ph name="SEPARATOR">•</ph> <ph name="BYTES_DOWNLOADED">%1$s<ex>4.3 MB</ex></ph> + </message> <message name="IDS_DOWNLOAD_NOTIFICATION_FAILED" desc="Download notification to be displayed when a download fails."> Download failed </message> @@ -2069,6 +2150,21 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_DOWNLOAD_STARTED" desc="Message to show when download has started [CHAR LIMIT=30]"> Downloading… </message> + <message name="IDS_DOWNLOAD_UI_KB" desc="String indicating the size of a downloaded file (in progress or complete), in kilobytes."> + <ph name="kilobytes">%1$3.2f<ex>12.5</ex></ph> KB + </message> + <message name="IDS_DOWNLOAD_UI_MB" desc="String indicating the size of a downloaded file (in progress or complete), in megabytes."> + <ph name="megabytes">%1$3.2f<ex>12.5</ex></ph> MB + </message> + <message name="IDS_DOWNLOAD_UI_GB" desc="String indicating the size of a downloaded file (in progress or complete), in gigabytes."> + <ph name="gigabytes">%1$3.2f<ex>12.5</ex></ph> GB + </message> + <message name="IDS_DOWNLOAD_UI_INDETERMINATE_BYTES" desc="Appears in a notification when a user starts downloading a file. Indicates the number of bytes downloaded out of an unknown total file size. E.g. 3/? MB [downloaded]. As appropriate for your language, use '/' or 'of'; and change word order as needed."> + <ph name="BYTES_DOWNLOADED_WITH_UNITS">%1$s<ex>12.2 MB</ex></ph> / ? + </message> + <message name="IDS_DOWNLOAD_UI_DETERMINATE_BYTES" desc="Appears in a notification when a user starts downloading a file. Indicates the number of bytes downloaded out of the total file size. E.g. 3/7 MB [downloaded]. As appropriate for your language, use '/' or 'of'; and change word order as needed."> + <ph name="BYTES_DOWNLOADED_WITH_UNITS">%1$s<ex>12.2 MB</ex></ph> / <ph name="FILE_SIZE_WITH_UNITS">%2$s<ex>20.3 GB</ex></ph> + </message> <message name="IDS_PREFETCH_BADGE_NEW" desc="Message on download home to show that there are new prefetched contents"> New </message> @@ -2084,14 +2180,17 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_FILE_SIZE_DOWNLOADED_MB" desc="Notification message showing how many MBs have been downloaded."> Downloaded <ph name="MBS">%1$.1f<ex>10.1</ex></ph> MB </message> + <message name="IDS_FILE_SIZE_DOWNLOADED_GB" desc="Notification message showing how many GBs have been downloaded."> + Downloaded <ph name="GBS">%1$.1f<ex>10.1</ex></ph> GB + </message> <message name="IDS_ONE_FILE_LEFT" desc="Message showing 1 file left"> 1 file left </message> <message name="IDS_FILES_LEFT" desc="Message showing how many files are left."> <ph name="FILES">%1$d<ex>10</ex></ph> files left </message> - <message name="IDS_FILE_SIZE_DOWNLOADED_GB" desc="Notification message showing how many GBs have been downloaded."> - Downloaded <ph name="GBS">%1$.1f<ex>10.1</ex></ph> GB + <message name="IDS_DOWNLOAD_UI_FILES_DOWNLOADED" desc="Number of files that have been downloaded. [ICU Syntax]"> + {FILES, plural, =1 {%1$d file downloaded} other {%1$d files downloaded}} </message> <message name="IDS_REMAINING_DURATION_DAYS" desc="Message to show remaining duration in multiple days"> <ph name="DAYS">%1$d<ex>2</ex></ph> days left @@ -2180,6 +2279,9 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_USED_GB" desc="String indicating that some amount of storage space on the device has been used by downloads, in gigabytes."> <ph name="gigabytes">%1$3.2f<ex>0.3</ex></ph> GB downloaded </message> + <message name="IDS_DOWNLOAD_MANAGER_UI_SPACE_USING" desc="String indicating the amount of storage space used by downloads out of total available storage."> + Using <ph name="SPACE_USED">%1$s<ex>0.3MB</ex></ph> of <ph name="SPACE_AVAILABLE">%2$s<ex>3 GB</ex></ph> + </message> <message name="IDS_DOWNLOAD_MANAGER_UI_ALL_DOWNLOADS" desc="Indicates that clicking on this button shows all of your downloads."> All </message> @@ -2225,6 +2327,12 @@ To obtain new licenses, connect to the internet and play your downloaded content <message name="IDS_DOWNLOAD_MANAGER_LIST_ITEM_DESCRIPTION" desc="Text containing the download list item description."> <ph name="FILE_SIZE">%1$s<ex>1.56 MB</ex></ph> - <ph name="DESCRIPTION">%2$s<ex>www.example.com</ex></ph> </message> + <message name="IDS_DOWNLOAD_MANAGER_FILES_TAB" desc="Tab text for showing the files a user explicitly downloaded."> + My Files + </message> + <message name="IDS_DOWNLOAD_MANAGER_PREFETCH_TAB" desc="Tab text for showing downloaded popular content."> + Popular Content + </message> <!-- Browsing History UI --> <message name="IDS_HISTORY_MANAGER_EMPTY" desc="Indicates that there are no browsing history items."> @@ -2326,28 +2434,31 @@ To obtain new licenses, connect to the internet and play your downloaded content </message> <!-- Strings for Streamlined Signin and Unified Consent. --> - <!-- TODO(https://crbug.com/814728): Make translatable when strings are approved. --> - <message name="IDS_SIGNIN_TITLE" desc="Title for the screen that asks users to sign-in and turn on Sync and personalization. [CHAR-LIMIT=27]" translateable="false"> - Get even more from Chrome + <message name="IDS_SIGNIN_TITLE" desc="Title for the screen that asks users to sign-in and turn on Sync and personalization. [CHAR-LIMIT=27]"> + Get Google smarts in Chrome </message> - <message name="IDS_SIGNIN_SYNC_DESCRIPTION" desc="Description of Sync feature for the screen that asks users to sign-in and turn on Sync and personalization." translateable="false"> - Sync your bookmarks, passwords, history, and more on all your devices + <message name="IDS_SIGNIN_SYNC_DESCRIPTION" desc="Description of Sync feature for the screen that asks users to sign-in and turn on Sync and personalization."> + Your passwords, history & more on all devices </message> - <message name="IDS_SIGNIN_PERSONALIZATION_DESCRIPTION" desc="Description of personalization feature for the screen that asks users to sign-in and turn on Sync and personalization." translateable="false"> - Get more personalized experiences, such as better content suggestions and smarter Translate + <message name="IDS_SIGNIN_PERSONALIZATION_DESCRIPTION" desc="Description of personalization features for the screen that asks users to sign-in and turn on Sync and personalization."> + Personalized Google services like Google Pay </message> - <message name="IDS_SIGNIN_GOOGLE_SERVICES_DESCRIPTION" desc="Description of Google Services for the screen that asks users to sign-in and turn on Sync and personalization." translateable="false"> - Bring powerful Google services to Chrome, like Google Pay and tap to search + <message name="IDS_SIGNIN_PERSONALIZATION_DESCRIPTION_CHILD_ACCOUNT" desc="Description of personalization features for the screen that asks users to sign-in and turn on Sync and personalization. This version of the description is used with child accounts."> + Personalized Google services </message> - <message name="IDS_SIGNIN_DETAILS_DESCRIPTION" desc="Message explaining that user can customize Sync and personalization and explains what data is shared with Google. This message is shown in the screen that asks users to sign-in and turn on Sync and personalization." translateable="false"> - You can customize what information Google collects in <ph name="BEGIN_LINK1"><LINK1></ph>Settings<ph name="END_LINK1"></LINK1></ph> anytime. - -Google may use your browsing activity, content on some sites you visit, and other browser interactions to personalize Chrome and other Google services like Translate, Search and ads. + <message name="IDS_SIGNIN_GOOGLE_SERVICES_DESCRIPTION" desc="Description of Google Services for the screen that asks users to sign-in and turn on Sync and personalization."> + Improve Chrome and its security by sending system and usage data to Google + </message> + <message name="IDS_SIGNIN_DETAILS_DESCRIPTION" desc="Message explaining that user can customize Sync and personalization and explains what data is shared with Google. This message is shown in the screen that asks users to sign-in and turn on Sync and personalization."> + <ph name="BEGIN_LINK1"><LINK1></ph>Settings<ph name="END_LINK1"></LINK1></ph> can be customized anytime. Google may use content on sites you visit, browser interactions and activity to personalize Chrome and Google services like Translate, Search, and ads. + </message> + <message name="IDS_SIGNIN_DETAILS_DESCRIPTION_CHILD_ACCOUNT" desc="Message explaining that user can customize Sync and personalization and explains what data is shared with Google. This message is shown in the screen that asks users to sign-in and turn on Sync and personalization. This version of the description is used with child accounts."> + <ph name="BEGIN_LINK1"><LINK1></ph>Settings<ph name="END_LINK1"></LINK1></ph> can be customized by you or your parents anytime. Google may use content on sites you visit, browser interactions and activity to personalize Chrome and Google services like Translate, Search, and ads. </message> - <message name="IDS_SIGNIN_ACCEPT_BUTTON" desc="Text for the confirmation button in the sign-in screen. By clicking this button users signs in and turns on Sync and personalization. [CHAR-LIMIT=20]" translateable="false"> + <message name="IDS_SIGNIN_ACCEPT_BUTTON" desc="Text for the confirmation button in the sign-in screen. By clicking this button users signs in and turns on Sync and personalization. [CHAR-LIMIT=20]"> Yes, I'm in </message> - <message name="IDS_SIGNIN_ACCOUNT_PICKER_DIALOG_TITLE" desc="The title for the dialog that shows the list of accounts on the device and asks user to select one of these accounts. [CHAR-LIMIT=27]" translateable="false"> + <message name="IDS_SIGNIN_ACCOUNT_PICKER_DIALOG_TITLE" desc="The title for the dialog that shows the list of accounts on the device and asks the user to select one of these accounts. [CHAR-LIMIT=27]"> Choose an account </message> @@ -2370,6 +2481,10 @@ Google may use your browsing activity, content on some sites you visit, and othe <message name="IDS_SIGNIN_PROMO_CHOOSE_ACCOUNT" desc="Button that the user can press if they are not the profile that Chrome found (opposite of 'Continue as Joe Doe')."> Not <ph name="EMAIL">%1$s<ex>john.doe@example.com</ex></ph>? </message> + <!-- Strings for signin promos when Unified Consent is enabled. --> + <message name="IDS_SIGNIN_PROMO_CHOOSE_ANOTHER_ACCOUNT" desc="Button that the user can press if they want to select a different account before signing in. This button is shown below 'Continue as Joe Doe' button that signs user in with default account."> + Choose another account + </message> <!-- Messages for remote media playback (casting) --> <message name="IDS_CAST_CASTING_VIDEO" desc="AtHome text to tell user which screen casting is happening. [CHAR LIMIT=40]"> @@ -2496,7 +2611,7 @@ Google may use your browsing activity, content on some sites you visit, and othe New incognito tab </message> <message name="IDS_CUSTOM_TAB_AMP_PUBLISHER_URL" desc="Text shown in a Custom Tab toolbar for a web page that is hosted by the Google content delivery network but was originally published by someone else."> - From <ph name="PUBLISHER_ORIGIN">%1$s<ex>example.com</ex></ph> – <ph name="BEGIN_DEEMPHASIZED"><bg></ph>delivered by Google<ph name="END_DEEMPHASIZED"></bg></ph> + From <ph name="PUBLISHER_ORIGIN"><pub>%1$s</pub><ex>example.com</ex></ph> – <ph name="BEGIN_DEEMPHASIZED"><bg></ph>delivered by Google<ph name="END_DEEMPHASIZED"></bg></ph> </message> <!-- Main menu items --> @@ -2569,6 +2684,9 @@ Google may use your browsing activity, content on some sites you visit, and othe <message name="IDS_MENU_CLOSE_ALL_INCOGNITO_TABS" desc="Menu item for closing all open incognito tabs. [CHAR-LIMIT=27]"> Close incognito tabs </message> + <message name="IDS_MENU_SEND_FEEDBACK" desc="Menu item for sending feedback. [CHAR-LIMIT=27]"> + Send feedback + </message> <!-- Bookmarks strings --> <message name="IDS_BOOKMARKS" desc="Title of the bookmarks page, which shows a list of the user's bookmarks. [CHAR-LIMIT=18]"> @@ -2767,9 +2885,6 @@ Google may use your browsing activity, content on some sites you visit, and othe <message name="IDS_ACCESSIBILITY_TOOLBAR_BTN_HOME" desc="Content description for the home button."> Home </message> - <message name="IDS_ACCESSIBILITY_TOOLBAR_BTN_EXPAND" desc="Content description for the Chrome Home sheet expand button. Tapping the button expands a panel that displays content suggestions, downloads, bookmarks, and history."> - Expand navigation panel - </message> <message name="IDS_ACCESSIBILITY_BTN_REFRESH" desc="Content description for the refresh page button."> Refresh page </message> @@ -2893,13 +3008,13 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr <message name="IDS_CONTEXTUAL_SEARCH_QUICK_ACTION_CAPTION_GENERIC_WEBSITE" desc="Caption displayed in the Contextual Search bar prompting the user to navigate to a web page."> Go to page </message> - <message name="IDS_CONTEXTUAL_SEARCH_IPH_ENTITY" desc="An in-product-help message for the Touch to Search feature on Chrome Android. The message encourages users to open a panel that contains search results for the word or phrase they tapped on."> + <message name="IDS_CONTEXTUAL_SEARCH_IPH_ENTITY" desc="An in-product-help message for the Tap to Search feature on Chrome Android. The message encourages users to open a panel that contains search results for the word or phrase they tapped on."> See instant search results in this panel </message> - <message name="IDS_CONTEXTUAL_SEARCH_IPH_SEARCH_RESULT" desc="An in-product-help message for the Touch to Search feature. It encourages users to open the Touch to Search panel to see search results for a word or phrase they have tapped."> + <message name="IDS_CONTEXTUAL_SEARCH_IPH_SEARCH_RESULT" desc="An in-product-help message for the Tap to Search feature. It encourages users to open the Tap to Search panel to see search results for a word or phrase they have tapped."> Tap a word to search instantly or see related actions </message> - <message name="IDS_CONTEXTUAL_SEARCH_IPH_TAP" desc="An in-product-help message for encouraging users to tap instead of long pressing to trigger the Touch to Search feature."> + <message name="IDS_CONTEXTUAL_SEARCH_IPH_TAP" desc="An in-product-help message for encouraging users to tap instead of long pressing to trigger the Tap to Search feature."> You can also search with a quick tap on a word </message> @@ -3017,19 +3132,6 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr Client side certificate selection is not supported by the operating system. </message> - <!-- Physical Web strings --> - <message name="IDS_PHYSICAL_WEB_PREF_TITLE" desc="Title for Physical Web preference."> - Physical Web - </message> - <message name="IDS_PHYSICAL_WEB_PREF_DESCRIPTION" desc="Description for Physical Web preference"> - Discover web pages sent by nearby objects. Chrome gathers web pages associated with objects around you, sends them anonymously to a Google service to find the ones most useful to you, then displays them. - -You must have Bluetooth and Location turned on in order to use the Physical Web. - </message> - <message name="IDS_PHYSICAL_WEB_LAUNCH_BUTTON" desc="The label for a button that opens a list of nearby URLs"> - See what’s nearby - </message> - <!-- WebUsb Picker UI strings --> <message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user."> <ph name="SITE">%1$s<ex>https://www.google.com</ex></ph> wants to connect @@ -3213,9 +3315,6 @@ You must have Bluetooth and Location turned on in order to use the Physical Web. <message name="IDS_IPH_DOWNLOAD_HOME_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility text to open download home after a restart."> Find your files and pages in Downloads from the More Options button </message> - <message name="IDS_IPH_DOWNLOAD_HOME_ACCESSIBILITY_TEXT_CHROME_HOME" desc="The in-product-help accessibility text to open download home after a restart in chrome home mode."> - Pull up the toolbar to find your files and pages in downloads - </message> <message name="IDS_IPH_DATA_SAVER_PREVIEW_TEXT" desc="In-product help for when a data saver preview page and infobar are shown."> Chrome is using less data to show you this page </message> @@ -3238,6 +3337,36 @@ You must have Bluetooth and Location turned on in order to use the Physical Web. <message name="IDS_SEARCH_WITH_PRODUCT" desc="Text for search widget with a search engine name"> Search with <ph name="PRODUCT_NAME">%1$s<ex>Google</ex></ph> </message> + <message name="IDS_IPH_DOWNLOAD_SETTINGS_TEXT" desc="The in-product-help message to open download settings in download home."> + Change the default download location any time + </message> + <message name="IDS_IPH_DOWNLOAD_SETTINGS_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility text to open download settings in download home."> + Change the default download location any time using the Settings menu option + </message> + <message name="IDS_IPH_DOWNLOAD_INFOBAR_DOWNLOAD_CONTINUING_TEXT" desc="The in-product-help message on the download InfoBar to inform that download is still continuing."> + Your download is still in progress + </message> + <message name="IDS_IPH_DOWNLOAD_INFOBAR_DOWNLOADS_ARE_FASTER_TEXT" desc="The in-product-help message on the download InfoBar to inform that downloads are now faster than before."> + Chrome now downloads files faster + </message> + <message name="IDS_IPH_NTP_BUTTON_TEXT_HOME_TEXT" desc="The in-product-help message to tap on the home button to navigate to the new tab page on the current tab."> + Tap to load the new tab page and view suggested articles + </message> + <message name="IDS_IPH_NTP_BUTTON_TEXT_HOME_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility message to tap on the home button to navigate to the new tab page on the current tab."> + Tap the home button to load the new tab page and view suggested articles + </message> + <message name="IDS_IPH_NTP_BUTTON_TEXT_NEWS_FEED_TEXT" desc="The in-product-help message to tap on the home button to navigate to the new tab page on the current tab."> + Tap to view articles selected specifically for you + </message> + <message name="IDS_IPH_NTP_BUTTON_TEXT_NEWS_FEED_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility message to tap on the home button to navigate to the new tab page on the current tab."> + Tap the home button to view articles selected specifically for you + </message> + <message name="IDS_IPH_NTP_BUTTON_TEXT_CHROME_TEXT" desc="The in-product-help message to tap on the home button to navigate to the new tab page on the current tab."> + Tap to get to the new tab page in your current tab + </message> + <message name="IDS_IPH_NTP_BUTTON_TEXT_CHROME_ACCESSIBILITY_TEXT" desc="The in-product-help accessibility message to tap on the home button to navigate to the new tab page on the current tab."> + Tap the home button to get to the new tab page in your current tab + </message> <!-- Launcher Shortcuts --> <message name="IDS_DISABLED_INCOGNITO_LAUNCHER_SHORTCUT_MESSAGE" desc="Text for a toast displayed prompting the user to remove the disabled 'New incognito tab' app shortcut and recreate it."> @@ -3276,11 +3405,14 @@ You must have Bluetooth and Location turned on in order to use the Physical Web. <!-- Interventions --> <message name="IDS_REDIRECT_BLOCKED_MESSAGE" desc="The message stating that a redirect (noun) was blocked on this page. This will be followed on a separate line with the address the user was being redirected to."> - Redirect blocked to site: + Redirect blocked: </message> <message name="IDS_REDIRECT_BLOCKED_SHORT_MESSAGE" desc="The short message stating that a redirect (noun) was blocked on this page."> Redirect blocked. </message> + <message name="IDS_ALWAYS_ALLOW_REDIRECTS" desc="The infobar button text allowing a user to always allow redirects (noun) after they were blocked on this page."> + Always allow + </message> <message name="IDS_NEAR_OOM_INTERVENTION_MESSAGE" desc="The message stating that the browser intervened to stop the page using too much memory."> This page uses too much memory, so Chrome paused it. </message> diff --git a/chromium/chrome/android/java_sources.gni b/chromium/chrome/android/java_sources.gni index 507af6c2051..414d3b18d51 100644 --- a/chromium/chrome/android/java_sources.gni +++ b/chromium/chrome/android/java_sources.gni @@ -2,7 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//components/feed/features.gni") import("//components/offline_pages/buildflags/features.gni") +import("//device/vr/buildflags/buildflags.gni") chrome_java_sources = [ "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java", @@ -85,7 +87,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/appmenu/AppMenuObserver.java", "java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java", "java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java", - "java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessory.java", + "java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardSuggestions.java", "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java", "java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java", "java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java", @@ -96,6 +98,22 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java", "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java", "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessoryPagerAdapter.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessorySheetCoordinator.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessorySheetMediator.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessorySheetModel.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryCoordinator.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessorySheetViewBinder.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryData.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryMediator.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryModel.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryView.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryViewBinder.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingCoordinator.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetCoordinator.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetModel.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetViewBinder.java", + "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetViewAdapter.java", "java/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTask.java", "java/src/org/chromium/chrome/browser/banners/AppBannerManager.java", "java/src/org/chromium/chrome/browser/banners/AppBannerUiDelegateAndroid.java", @@ -137,12 +155,14 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/browseractions/BrowserActionsTabCreatorManager.java", "java/src/org/chromium/chrome/browser/browseractions/BrowserActionsTabModelSelector.java", "java/src/org/chromium/chrome/browser/browseractions/BrowserActionsTabPersistencePolicy.java", + "java/src/org/chromium/chrome/browser/browserservices/BrowserServicesMetrics.java", "java/src/org/chromium/chrome/browser/browserservices/BrowserSessionContentHandler.java", "java/src/org/chromium/chrome/browser/browserservices/BrowserSessionContentUtils.java", "java/src/org/chromium/chrome/browser/browserservices/BrowserSessionDataProvider.java", "java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java", "java/src/org/chromium/chrome/browser/browserservices/Origin.java", "java/src/org/chromium/chrome/browser/browserservices/PostMessageHandler.java", + "java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClient.java", "java/src/org/chromium/chrome/browser/browsing_data/UrlFilters.java", "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java", "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java", @@ -211,6 +231,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/compositor/layouts/phone/SimpleAnimationLayout.java", "java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java", "java/src/org/chromium/chrome/browser/compositor/layouts/phone/StackLayoutBase.java", + "java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/NonOverlappingStack.java", + "java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/OverlappingStack.java", "java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java", "java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimation.java", "java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackAnimationLandscape.java", @@ -302,13 +324,13 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsCoordinator.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsDependencyFactory.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsEventReporter.java", - "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsFooter.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsMediator.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsModel.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsSource.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/EnabledStateMonitor.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/FetchHelper.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/PageViewTimer.java", + "java/src/org/chromium/chrome/browser/contextual_suggestions/PeekConditions.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ToolbarCoordinator.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ToolbarView.java", "java/src/org/chromium/chrome/browser/contextual_suggestions/ToolbarViewBinder.java", @@ -323,6 +345,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/crash/MinidumpUploadService.java", "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionHandler.java", "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java", + "java/src/org/chromium/chrome/browser/crypto/ByteArrayGenerator.java", + "java/src/org/chromium/chrome/browser/crypto/CipherFactory.java", "java/src/org/chromium/chrome/browser/customtabs/ClientManager.java", "java/src/org/chromium/chrome/browser/customtabs/CustomButtonParams.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java", @@ -335,7 +359,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java", "java/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicy.java", - "java/src/org/chromium/chrome/browser/customtabs/LoadingPredictor.java", "java/src/org/chromium/chrome/browser/customtabs/RequestThrottler.java", "java/src/org/chromium/chrome/browser/customtabs/NavigationInfoCaptureTrigger.java", "java/src/org/chromium/chrome/browser/customtabs/SeparateTaskCustomTabActivity.java", @@ -366,14 +389,17 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java", "java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeTabInfo.java", "java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java", + "java/src/org/chromium/chrome/browser/download/DirectoryOption.java", "java/src/org/chromium/chrome/browser/download/DownloadActivity.java", "java/src/org/chromium/chrome/browser/download/DownloadBroadcastManager.java", "java/src/org/chromium/chrome/browser/download/DownloadBroadcastReceiver.java", "java/src/org/chromium/chrome/browser/download/DownloadController.java", + "java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java", "java/src/org/chromium/chrome/browser/download/DownloadForegroundService.java", "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceManager.java", "java/src/org/chromium/chrome/browser/download/DownloadForegroundServiceObservers.java", "java/src/org/chromium/chrome/browser/download/DownloadInfo.java", + "java/src/org/chromium/chrome/browser/download/DownloadInfoBarController.java", "java/src/org/chromium/chrome/browser/download/DownloadItem.java", "java/src/org/chromium/chrome/browser/download/DownloadLocationDialog.java", "java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java", @@ -399,6 +425,31 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/download/OMADownloadHandler.java", "java/src/org/chromium/chrome/browser/download/SystemDownloadNotifier.java", "java/src/org/chromium/chrome/browser/download/SystemDownloadNotifier2.java", + "java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorImpl.java", + "java/src/org/chromium/chrome/browser/download/home/OfflineItemSource.java", + "java/src/org/chromium/chrome/browser/download/home/filter/DeleteUndoOfflineItemFilter.java", + "java/src/org/chromium/chrome/browser/download/home/filter/Filters.java", + "java/src/org/chromium/chrome/browser/download/home/filter/FilterChipsProvider.java", + "java/src/org/chromium/chrome/browser/download/home/filter/FilterCoordinator.java", + "java/src/org/chromium/chrome/browser/download/home/filter/FilterModel.java", + "java/src/org/chromium/chrome/browser/download/home/filter/FilterView.java", + "java/src/org/chromium/chrome/browser/download/home/filter/FilterViewBinder.java", + "java/src/org/chromium/chrome/browser/download/home/filter/OfflineItemFilter.java", + "java/src/org/chromium/chrome/browser/download/home/filter/OfflineItemFilterObserver.java", + "java/src/org/chromium/chrome/browser/download/home/filter/OfflineItemFilterSource.java", + "java/src/org/chromium/chrome/browser/download/home/filter/SearchOfflineItemFilter.java", + "java/src/org/chromium/chrome/browser/download/home/filter/TypeOfflineItemFilter.java", + "java/src/org/chromium/chrome/browser/download/home/filter/chips/Chip.java", + "java/src/org/chromium/chrome/browser/download/home/filter/chips/ChipsCoordinator.java", + "java/src/org/chromium/chrome/browser/download/home/filter/chips/ChipsModel.java", + "java/src/org/chromium/chrome/browser/download/home/filter/chips/ChipsProvider.java", + "java/src/org/chromium/chrome/browser/download/home/filter/chips/ChipsViewBinder.java", + "java/src/org/chromium/chrome/browser/download/home/filter/chips/ChipView.java", + "java/src/org/chromium/chrome/browser/download/home/list/CalendarFactory.java", + "java/src/org/chromium/chrome/browser/download/home/list/CalendarUtils.java", + "java/src/org/chromium/chrome/browser/download/home/list/BatchListObservable.java", + "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListModel.java", + "java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMutator.java", "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorFactory.java", "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUi.java", "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiFactory.java", @@ -420,6 +471,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/download/ui/LoadingStateDelegate.java", "java/src/org/chromium/chrome/browser/download/ui/OfflineGroupHeaderView.java", "java/src/org/chromium/chrome/browser/download/ui/SpaceDisplay.java", + "java/src/org/chromium/chrome/browser/download/ui/StorageSummary.java", "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java", "java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java", "java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java", @@ -436,12 +488,12 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/feature_engagement/ScreenshotMonitorDelegate.java", "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSourceAdapter.java", - "java/src/org/chromium/chrome/browser/feedback/ChromeHomeFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/ConnectivityTask.java", "java/src/org/chromium/chrome/browser/feedback/DataReductionProxyFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java", + "java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackReporter.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/FeedbackSourceProvider.java", @@ -452,6 +504,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/feedback/ProcessIdFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotSource.java", "java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java", + "java/src/org/chromium/chrome/browser/feedback/SimplifiedNtpFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/StaticScreenshotSource.java", "java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java", "java/src/org/chromium/chrome/browser/feedback/UrlFeedbackSource.java", @@ -477,6 +530,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/firstrun/FirstRunView.java", "java/src/org/chromium/chrome/browser/firstrun/FirstRunViewPager.java", "java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java", + "java/src/org/chromium/chrome/browser/firstrun/SigninFirstRunFragment.java", "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java", "java/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiver.java", "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java", @@ -485,6 +539,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java", "java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java", "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java", + "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java", "java/src/org/chromium/chrome/browser/gcore/ConnectedTask.java", @@ -552,7 +607,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/infobar/ReaderModeInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SimpleConfirmInfoBarBuilder.java", + "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java", "java/src/org/chromium/chrome/browser/infobar/AdsBlockedInfoBar.java", + "java/src/org/chromium/chrome/browser/infobar/DownloadProgressInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java", "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java", @@ -594,7 +651,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java", "java/src/org/chromium/chrome/browser/locale/LocaleManager.java", "java/src/org/chromium/chrome/browser/locale/SogouPromoDialog.java", - "java/src/org/chromium/chrome/browser/locale/SpecialLocaleHandler.java", + "java/src/org/chromium/chrome/browser/locale/LocaleTemplateUrlLoader.java", "java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationService.java", "java/src/org/chromium/chrome/browser/media/MediaViewerUtils.java", "java/src/org/chromium/chrome/browser/media/PictureInPicture.java", @@ -655,6 +712,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java", "java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java", "java/src/org/chromium/chrome/browser/metrics/ActivityStopMetrics.java", + "java/src/org/chromium/chrome/browser/metrics/ActivityTabStartupMetricsTracker.java", "java/src/org/chromium/chrome/browser/metrics/ImpressionTracker.java", "java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java", "java/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetrics.java", @@ -663,8 +721,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/metrics/OneShotImpressionListener.java", "java/src/org/chromium/chrome/browser/metrics/PackageMetrics.java", "java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java", - "java/src/org/chromium/chrome/browser/metrics/StartupMetrics.java", - "java/src/org/chromium/chrome/browser/metrics/StartupPageLoadMetricsObserver.java", "java/src/org/chromium/chrome/browser/metrics/UkmUtilsForTest.java", "java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java", "java/src/org/chromium/chrome/browser/metrics/UmaUtils.java", @@ -676,11 +732,14 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/modaldialog/ModalDialogView.java", "java/src/org/chromium/chrome/browser/modaldialog/TabModalLifetimeHandler.java", "java/src/org/chromium/chrome/browser/modaldialog/TabModalPresenter.java", + "java/src/org/chromium/chrome/browser/modelutil/LazyViewBinderAdapter.java", + "java/src/org/chromium/chrome/browser/modelutil/ListModelChangeProcessor.java", "java/src/org/chromium/chrome/browser/modelutil/ListObservable.java", "java/src/org/chromium/chrome/browser/modelutil/PropertyModelChangeProcessor.java", "java/src/org/chromium/chrome/browser/modelutil/PropertyObservable.java", "java/src/org/chromium/chrome/browser/modelutil/RecyclerViewModelChangeProcessor.java", "java/src/org/chromium/chrome/browser/modelutil/RecyclerViewAdapter.java", + "java/src/org/chromium/chrome/browser/modelutil/SimpleListObservable.java", "java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java", "java/src/org/chromium/chrome/browser/multiwindow/MultiInstanceChromeTabbedActivity.java", "java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java", @@ -760,7 +819,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ntp/cards/ScrollToLoadListener.java", "java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java", "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java", - "java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java", "java/src/org/chromium/chrome/browser/ntp/cards/StatusCardViewHolder.java", "java/src/org/chromium/chrome/browser/ntp/cards/StatusItem.java", "java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsCategoryInfo.java", @@ -833,12 +891,14 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java", "java/src/org/chromium/chrome/browser/omnibox/OmniboxResultsAdapter.java", "java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestion.java", + "java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestionsList.java", "java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java", "java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java", "java/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModel.java", "java/src/org/chromium/chrome/browser/omnibox/SuggestionAnswer.java", "java/src/org/chromium/chrome/browser/omnibox/SuggestionView.java", "java/src/org/chromium/chrome/browser/omnibox/UrlBar.java", + "java/src/org/chromium/chrome/browser/omnibox/UrlBarData.java", "java/src/org/chromium/chrome/browser/omnibox/UrlFocusChangeListener.java", "java/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProvider.java", "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java", @@ -849,7 +909,9 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/page_info/CertificateChainHelper.java", "java/src/org/chromium/chrome/browser/page_info/CertificateViewer.java", "java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java", - "java/src/org/chromium/chrome/browser/page_info/PageInfoPopup.java", + "java/src/org/chromium/chrome/browser/page_info/PageInfoDialog.java", + "java/src/org/chromium/chrome/browser/page_info/PageInfoController.java", + "java/src/org/chromium/chrome/browser/page_info/PageInfoView.java", "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmark.java", "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksFaviconThrottle.java", "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java", @@ -922,7 +984,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/permissions/PermissionDialogDelegate.java", "java/src/org/chromium/chrome/browser/permissions/PermissionDialogView.java", "java/src/org/chromium/chrome/browser/permissions/PermissionUmaUtil.java", - "java/src/org/chromium/chrome/browser/physicalweb/BitmapHttpRequest.java", "java/src/org/chromium/chrome/browser/photo_picker/BitmapScalerTask.java", "java/src/org/chromium/chrome/browser/photo_picker/BitmapUtils.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java", @@ -936,21 +997,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java", "java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapViewHolder.java", "java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java", - "java/src/org/chromium/chrome/browser/physicalweb/HttpRequest.java", - "java/src/org/chromium/chrome/browser/physicalweb/JsonObjectHttpRequest.java", - "java/src/org/chromium/chrome/browser/physicalweb/NearbyBackgroundSubscription.java", - "java/src/org/chromium/chrome/browser/physicalweb/NearbyForegroundSubscription.java", - "java/src/org/chromium/chrome/browser/physicalweb/NearbyMessageIntentService.java", - "java/src/org/chromium/chrome/browser/physicalweb/NearbySubscription.java", - "java/src/org/chromium/chrome/browser/physicalweb/PhysicalWeb.java", - "java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebBleClient.java", - "java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebUma.java", - "java/src/org/chromium/chrome/browser/physicalweb/PwsClient.java", - "java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java", - "java/src/org/chromium/chrome/browser/physicalweb/PwsResult.java", - "java/src/org/chromium/chrome/browser/physicalweb/UrlInfo.java", - "java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java", - "java/src/org/chromium/chrome/browser/physicalweb/Utils.java", "java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java", "java/src/org/chromium/chrome/browser/preferences/AboutChromePreferences.java", "java/src/org/chromium/chrome/browser/preferences/AccessibilityPreferences.java", @@ -1014,6 +1060,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionStatsPreference.java", "java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionDataUseItem.java", "java/src/org/chromium/chrome/browser/preferences/download/DownloadDirectoryAdapter.java", + "java/src/org/chromium/chrome/browser/preferences/download/DownloadLocationPreference.java", + "java/src/org/chromium/chrome/browser/preferences/download/DownloadLocationPreferenceAdapter.java", "java/src/org/chromium/chrome/browser/preferences/download/DownloadPreferences.java", "java/src/org/chromium/chrome/browser/preferences/languages/AddLanguageFragment.java", "java/src/org/chromium/chrome/browser/preferences/languages/LanguagesManager.java", @@ -1050,7 +1098,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/preferences/privacy/ContextualSearchPreferenceFragment.java", "java/src/org/chromium/chrome/browser/preferences/privacy/DoNotTrackPreference.java", "java/src/org/chromium/chrome/browser/preferences/privacy/OtherFormsOfHistoryDialogFragment.java", - "java/src/org/chromium/chrome/browser/preferences/privacy/PhysicalWebPreferenceFragment.java", "java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java", "java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManager.java", "java/src/org/chromium/chrome/browser/preferences/privacy/UsageAndCrashReportsPreferenceFragment.java", @@ -1077,9 +1124,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java", "java/src/org/chromium/chrome/browser/preferences/website/StorageInfo.java", "java/src/org/chromium/chrome/browser/preferences/website/TranslatePreferences.java", - "java/src/org/chromium/chrome/browser/preferences/website/UsbChooserPreferences.java", - "java/src/org/chromium/chrome/browser/preferences/website/UsbDevicePreferences.java", - "java/src/org/chromium/chrome/browser/preferences/website/UsbInfo.java", + "java/src/org/chromium/chrome/browser/preferences/website/ChosenObjectPreferences.java", + "java/src/org/chromium/chrome/browser/preferences/website/ChosenObjectInfo.java", "java/src/org/chromium/chrome/browser/preferences/website/Website.java", "java/src/org/chromium/chrome/browser/preferences/website/WebsiteAddress.java", "java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java", @@ -1102,6 +1148,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java", "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java", "java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java", + "java/src/org/chromium/chrome/browser/search_engines/TemplateUrl.java", "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java", "java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java", "java/src/org/chromium/chrome/browser/searchwidget/SearchActivityFadingBackgroundView.java", @@ -1252,6 +1299,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserver.java", + "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelOrderController.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java", "java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java", @@ -1289,6 +1337,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/toolbar/TabSwitcherDrawable.java", "java/src/org/chromium/chrome/browser/toolbar/Toolbar.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarActionModeCallback.java", + "java/src/org/chromium/chrome/browser/toolbar/ToolbarButtonInProductHelpController.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java", "java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java", @@ -1395,8 +1444,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/WebappTabDelegate.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorFactory.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java", + "java/src/org/chromium/chrome/browser/webauth/Fido2ApiHandler.java", "java/src/org/chromium/chrome/browser/webauth/HandlerResponseCallback.java", - "java/src/org/chromium/chrome/browser/webauth/U2fApiHandler.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", "java/src/org/chromium/chrome/browser/widget/AlertDialogEditText.java", @@ -1429,6 +1478,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/widget/RadioButtonLayout.java", "java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java", "java/src/org/chromium/chrome/browser/widget/RoundedIconGenerator.java", + "java/src/org/chromium/chrome/browser/widget/TextViewWithCompoundDrawables.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailGenerator.java", "java/src/org/chromium/chrome/browser/widget/ThumbnailGeneratorCallback.java", @@ -1472,6 +1522,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarObserver.java", "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarPhone.java", "java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarTablet.java", + "java/src/org/chromium/chrome/browser/widget/incognitotoggle/IncognitoToggleButton.java", "java/src/org/chromium/chrome/browser/widget/incognitotoggle/IncognitoToggleButtonTablet.java", "java/src/org/chromium/chrome/browser/widget/newtab/NewTabButton.java", "java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java", @@ -1480,6 +1531,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/widget/selection/SelectableListLayout.java", "java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java", "java/src/org/chromium/chrome/browser/widget/textbubble/ArrowBubbleDrawable.java", + "java/src/org/chromium/chrome/browser/widget/textbubble/ImageTextBubble.java", "java/src/org/chromium/chrome/browser/widget/textbubble/TextBubble.java", ] @@ -1548,12 +1600,15 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java", "javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java", "javatests/src/org/chromium/chrome/browser/appmenu/DataSaverAppMenuTest.java", - "javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java", + "javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java", "javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java", "javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java", + "javatests/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryViewTest.java", + "javatests/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessorySheetViewTest.java", + "javatests/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetViewTest.java", "javatests/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java", "javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java", "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java", @@ -1563,6 +1618,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/browseractions/BrowserActionActivityTest.java", "javatests/src/org/chromium/chrome/browser/browserservices/OriginVerifierTest.java", "javatests/src/org/chromium/chrome/browser/browserservices/OriginTest.java", + "javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityClientTest.java", "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBaseTest.java", "javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java", @@ -1587,10 +1643,11 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/contextual_suggestions/ContextualSuggestionsTest.java", "javatests/src/org/chromium/chrome/browser/contextual_suggestions/FakeContextualSuggestionsSource.java", "javatests/src/org/chromium/chrome/browser/contextual_suggestions/FakeEnabledStateMonitor.java", - "javatests/src/org/chromium/chrome/browser/contextual_suggestions/FakeFetchHelper.java", + "javatests/src/org/chromium/chrome/browser/contextual_suggestions/FakeTracker.java", "javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableTest.java", "javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java", "javatests/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporterTest.java", + "javatests/src/org/chromium/chrome/browser/crypto/CipherFactoryTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/ClientManagerTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java", "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestRule.java", @@ -1608,6 +1665,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java", "javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java", + "javatests/src/org/chromium/chrome/browser/download/DownloadInfoBarControllerTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java", "javatests/src/org/chromium/chrome/browser/download/DownloadNotificationService2Test.java", @@ -1633,6 +1691,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java", "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java", + "javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTestUtils.java", "javatests/src/org/chromium/chrome/browser/gcore/MockConnectedTask.java", "javatests/src/org/chromium/chrome/browser/gcore/MockConnectedTaskTest.java", "javatests/src/org/chromium/chrome/browser/gsa/GSAAccountChangeListenerTest.java", @@ -1728,7 +1787,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java", "javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java", "javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java", - "javatests/src/org/chromium/chrome/browser/page_info/PageInfoPopupTest.java", + "javatests/src/org/chromium/chrome/browser/page_info/PageInfoControllerTest.java", "javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationIntegrationTestRule.java", "javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationUnitTestRule.java", "javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableBookmarksEditingUnitTest.java", @@ -1737,8 +1796,6 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java", "javatests/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialogTest.java", - "javatests/src/org/chromium/chrome/browser/physicalweb/MockPwsClient.java", - "javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java", "javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java", "javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java", "javatests/src/org/chromium/chrome/browser/payments/CurrencyFormatterTest.java", @@ -1810,6 +1867,7 @@ chrome_test_java_sources = [ "javatests/src/org/chromium/chrome/browser/permissions/PermissionNavigationTest.java", "javatests/src/org/chromium/chrome/browser/permissions/PermissionTestRule.java", "javatests/src/org/chromium/chrome/browser/permissions/QuotaTest.java", + "javatests/src/org/chromium/chrome/browser/preferences/ContextualSuggestionsPreferenceTest.java", "javatests/src/org/chromium/chrome/browser/preferences/NotificationsPreferencesTest.java", "javatests/src/org/chromium/chrome/browser/preferences/PasswordViewingTypeTest.java", "javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java", @@ -1954,6 +2012,10 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/DisableHistogramsRule.java", "junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java", "junit/src/org/chromium/chrome/browser/SSLClientCertificateRequestTest.java", + "junit/src/org/chromium/chrome/browser/autofill/keyboard_accessory/AccessorySheetControllerTest.java", + "junit/src/org/chromium/chrome/browser/autofill/keyboard_accessory/KeyboardAccessoryControllerTest.java", + "junit/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingControllerTest.java", + "junit/src/org/chromium/chrome/browser/autofill/keyboard_accessory/PasswordAccessorySheetControllerTest.java", "junit/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTaskTest.java", "junit/src/org/chromium/chrome/browser/browseractions/BrowserActionsIntentTest.java", "junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimatorTest.java", @@ -1967,11 +2029,18 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionControllerTest.java", "junit/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManagerTest.java", "junit/src/org/chromium/chrome/browser/contextual_suggestions/FetchHelperTest.java", + "junit/src/org/chromium/chrome/browser/contextual_suggestions/GoogleSearchRestrictionTest.java", "junit/src/org/chromium/chrome/browser/contextual_suggestions/PageViewTimerTest.java", "junit/src/org/chromium/chrome/browser/cookies/CanonicalCookieTest.java", "junit/src/org/chromium/chrome/browser/crash/LogcatExtractionRunnableUnitTest.java", "junit/src/org/chromium/chrome/browser/customtabs/NavigationInfoCaptureTriggerTest.java", "junit/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntryTest.java", + "junit/src/org/chromium/chrome/browser/download/home/filter/DeleteUndoOfflineItemFilterTest.java", + "junit/src/org/chromium/chrome/browser/download/home/filter/FiltersTest.java", + "junit/src/org/chromium/chrome/browser/download/home/filter/OfflineItemFilterTest.java", + "junit/src/org/chromium/chrome/browser/download/home/filter/SearchOfflineItemFilterTest.java", + "junit/src/org/chromium/chrome/browser/download/home/filter/TypeOfflineItemFilterTest.java", + "junit/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMutatorTest.java", "junit/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiTest.java", "junit/src/org/chromium/chrome/browser/download/DownloadResumptionSchedulerTest.java", "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.java", @@ -2013,6 +2082,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestTabHolder.java", "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTitleUpdatedTest.java", "junit/src/org/chromium/chrome/browser/metrics/VariationsSessionTest.java", + "junit/src/org/chromium/chrome/browser/modelutil/SimpleListObservableTest.java", "junit/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java", "junit/src/org/chromium/chrome/browser/notifications/channels/ChannelDefinitionsTest.java", "junit/src/org/chromium/chrome/browser/ntp/NativePageFactoryTest.java", @@ -2024,6 +2094,7 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java", "junit/src/org/chromium/chrome/browser/ntp/cards/SectionListTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java", + "junit/src/org/chromium/chrome/browser/offlinepages/CctOfflinePageModelObserverTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/ClientIdTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/OfflineBackgroundTaskTest.java", "junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeUnitTest.java", @@ -2050,9 +2121,6 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java", "junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java", "junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java", - "junit/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java", - "junit/src/org/chromium/chrome/browser/physicalweb/PwsResultTest.java", - "junit/src/org/chromium/chrome/browser/physicalweb/UrlInfoTest.java", "junit/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java", "junit/src/org/chromium/chrome/browser/preferences/password/DialogManagerTest.java", "junit/src/org/chromium/chrome/browser/preferences/password/EnsureAsyncPostingRule.java", @@ -2088,3 +2156,16 @@ if (enable_offline_pages_harness) { chrome_java_sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ] chrome_test_java_sources += [ "javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageSavePageLaterEvaluationTest.java" ] } + +if (enable_feed_in_chrome) { + chrome_junit_test_java_sources += + [ "junit/src/org/chromium/chrome/browser/feed/FeedImageLoaderTest.java" ] +} + +# This is enable_arcore, not package_arcore because the apk merger, for +# example, would complain that the java classes.dex differs between 32bit and +# 64bit. We must include this, even if we're not packaging the shim. +if (enable_arcore) { + chrome_java_sources += + [ "java/src/org/chromium/chrome/browser/vr/ArCoreJavaUtils.java" ] +} diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn index 688dc490d18..019d3ac9033 100644 --- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn +++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn @@ -11,6 +11,8 @@ unbound_shell_apk_manifest = "$target_gen_dir/unbound_shell_apk_manifest/AndroidManifest.xml" maps_go_apk_manifest = "$target_gen_dir/maps_go_apk_manifest/AndroidManifest.xml" +shell_apk_http_manifest = + "$target_gen_dir/shell_apk_http_manifest/AndroidManifest.xml" manifest_processor_template("shell_apk_manifest") { input = "AndroidManifest.xml" @@ -36,6 +38,14 @@ manifest_processor_template("maps_go_apk_manifest") { extra_variables = [ "shell_apk_version=$template_shell_apk_version" ] } +manifest_processor_template("shell_apk_http_manifest") { + input = "AndroidManifest.xml" + config_file = "http_manifest_config.json" + output = shell_apk_http_manifest + + extra_variables = [ "shell_apk_version=$template_shell_apk_version" ] +} + android_resources("shell_apk_resources") { resource_dirs = [ "res" ] custom_package = "org.chromium.webapk.shell_apk" @@ -185,6 +195,12 @@ webapk_tmpl("unbound_webapk") { apk_name = "UnboundWebApk" } +webapk_tmpl("http_webapk") { + android_manifest = shell_apk_http_manifest + android_manifest_dep = ":shell_apk_http_manifest" + apk_name = "HttpWebApk" +} + android_library("shell_apk_javatests") { testonly = true java_files = diff --git a/chromium/chrome/android/webapk/shell_apk/http_manifest_config.json b/chromium/chrome/android/webapk/shell_apk/http_manifest_config.json new file mode 100644 index 00000000000..d99448ae7f2 --- /dev/null +++ b/chromium/chrome/android/webapk/shell_apk/http_manifest_config.json @@ -0,0 +1,34 @@ +{ + "manifest_package": "org.chromium.webapk.http", + "scope_url": "http://pwa.rocks/", + "intent_filters": { + "scope_url_scheme": "http", + "scope_url_host": "pwa.rocks", + "scope_url_path_type": "android:pathPrefix", + "scope_url_path": "/" + }, + "start_url": "http://pwa.rocks/", + "display_mode": "standalone", + "orientation": "portrait", + "theme_color": "2147483648L", + "background_color": "2147483648L", + "splash_screen_icon": "@mipmap/app_icon", + "icon_urls_and_icon_murmur2_hashes": "http://www.pwa.rocks/icon1.png 0 http://www.pwa.rocks/icon2.png 0", + "web_manifest_url": "https://pwa.rocks/pwa.webmanifest", + "version_code": "1", + "version_name": "1.0", + "bound_webapk": { + "runtime_host": "com.google.android.apps.chrome", + "runtime_host_application_name": "Chromium" + }, + "share_template": [{ + "index": "0", + "title": "Share All", + "url_template": "http://pwa.rocks/share_public?title={title}&text={text}&url={url}" + }, + { + "index": "1", + "title": "Share Title", + "url_template": "http://pwa.rocks/share_private?title={title}" + }] +} diff --git a/chromium/chrome/android/webapk/shell_apk/shell_apk_version.gni b/chromium/chrome/android/webapk/shell_apk/shell_apk_version.gni index 49978637f3c..c4969121c5b 100644 --- a/chromium/chrome/android/webapk/shell_apk/shell_apk_version.gni +++ b/chromium/chrome/android/webapk/shell_apk/shell_apk_version.gni @@ -6,7 +6,7 @@ # (including AndroidManifest.xml) is updated. This version should be incremented # prior to uploading a new ShellAPK to the WebAPK Minting Server. # Does not affect Chrome.apk -template_shell_apk_version = 45 +template_shell_apk_version = 46 # The ShellAPK version expected by Chrome. Chrome will try to update the WebAPK # if the WebAPK's ShellAPK version is less than |expected_shell_apk_version|. |