Patches for 145.0.7632.120
This commit is contained in:
@@ -2271,7 +2271,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn
|
||||
diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
|
||||
--- a/components/omnibox/browser/search_provider.cc
|
||||
+++ b/components/omnibox/browser/search_provider.cc
|
||||
@@ -947,7 +947,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
|
||||
@@ -951,7 +951,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
|
||||
// is required.
|
||||
// Request for suggestions in OTR contexts is not allowed; except for the Lens
|
||||
// searchboxes.
|
||||
|
||||
@@ -666,7 +666,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
namespace about_flags {
|
||||
|
||||
namespace {
|
||||
@@ -5201,6 +5205,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
|
||||
@@ -5135,6 +5139,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
|
||||
};
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -677,7 +677,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
// RECORDING USER METRICS FOR FLAGS:
|
||||
// -----------------------------------------------------------------------------
|
||||
// The first line of the entry is the internal name.
|
||||
@@ -5227,6 +5235,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
|
||||
@@ -5161,6 +5169,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
|
||||
// //tools/flags/generate_unexpire_flags.py.
|
||||
@@ -1012,7 +1012,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
|
||||
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -1937,5 +1937,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -1951,5 +1951,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
// happen silently without prompting an updating dialog.
|
||||
BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
|
||||
#include "base/functional/callback.h"
|
||||
#include "base/i18n/break_iterator.h"
|
||||
#include "base/i18n/case_conversion.h"
|
||||
@@ -658,6 +659,9 @@ void SearchProvider::Run(bool query_is_private) {
|
||||
@@ -662,6 +663,9 @@ void SearchProvider::Run(bool query_is_private) {
|
||||
}
|
||||
|
||||
void SearchProvider::DoHistoryQuery(bool minimal_changes) {
|
||||
@@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/i18n/char_iterator.h"
|
||||
@@ -643,6 +645,8 @@ GURL FixupURLInternal(std::string_view text,
|
||||
@@ -640,6 +642,8 @@ GURL FixupURLInternal(const std::string& text,
|
||||
|
||||
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
|
||||
if (chrome_url && !parts.host.is_valid()) {
|
||||
|
||||
@@ -1136,7 +1136,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
|
||||
// Implementors can override this method to avoid using automatic embargo.
|
||||
virtual bool UsesAutomaticEmbargo() const;
|
||||
|
||||
@@ -292,7 +315,8 @@ class PermissionContextBase : public content_settings::Observer {
|
||||
@@ -297,7 +320,8 @@ class PermissionContextBase : public content_settings::Observer {
|
||||
// allows/blocks/dismisses a permission prompt.
|
||||
void PermissionDecided(PermissionDecision decision,
|
||||
bool is_final_decision,
|
||||
@@ -1144,8 +1144,8 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
|
||||
+ const PermissionRequestData& request_data,
|
||||
+ content_settings::mojom::LifetimeMode lifetime_option);
|
||||
|
||||
void NotifyObservers(const ContentSettingsPattern& primary_pattern,
|
||||
const ContentSettingsPattern& secondary_pattern,
|
||||
raw_ptr<content::BrowserContext> browser_context_;
|
||||
const ContentSettingsType content_settings_type_;
|
||||
diff --git a/components/permissions/permission_prompt.h b/components/permissions/permission_prompt.h
|
||||
--- a/components/permissions/permission_prompt.h
|
||||
+++ b/components/permissions/permission_prompt.h
|
||||
|
||||
@@ -736,7 +736,7 @@ new file mode 100644
|
||||
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -2263,6 +2263,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
@@ -2273,6 +2273,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
{"clearedData", IDS_SETTINGS_CLEARED_DATA},
|
||||
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
|
||||
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
|
||||
|
||||
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/android/java/src/org/chromium/components/
|
||||
diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
|
||||
--- a/components/search_engines/android/template_url_service_android.cc
|
||||
+++ b/components/search_engines/android/template_url_service_android.cc
|
||||
@@ -400,6 +400,7 @@ bool TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
|
||||
@@ -402,6 +402,7 @@ bool TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
|
||||
jimage_translate_source_language_param_key,
|
||||
const base::android::JavaRef<jstring>&
|
||||
jimage_translate_target_language_param_key) {
|
||||
|
||||
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
|
||||
#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
|
||||
#include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
|
||||
#include "third_party/blink/public/platform/platform.h"
|
||||
@@ -776,6 +777,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
|
||||
@@ -777,6 +778,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
|
||||
return To<LocalDOMWindow>(GetExecutionContext());
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/
|
||||
diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
|
||||
--- a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
|
||||
+++ b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
|
||||
@@ -412,6 +412,7 @@ void OfflineAudioContext::FireCompletionEvent() {
|
||||
@@ -410,6 +410,7 @@ void OfflineAudioContext::FireCompletionEvent() {
|
||||
if (!rendered_buffer) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1670,7 +1670,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
||||
diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
|
||||
--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
|
||||
+++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
|
||||
@@ -768,7 +768,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
|
||||
@@ -769,7 +769,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
|
||||
.SetTimeout(timeout)
|
||||
.SetUrl(fetch_url)
|
||||
.SetUploadProgressCallback(std::move(upload_progress_callback))
|
||||
@@ -1730,7 +1730,7 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
|
||||
diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc
|
||||
--- a/components/contextual_search/internal/composebox_query_controller.cc
|
||||
+++ b/components/contextual_search/internal/composebox_query_controller.cc
|
||||
@@ -705,7 +705,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
|
||||
@@ -825,7 +825,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
|
||||
.SetTimeout(timeout)
|
||||
.SetUploadProgressCallback(std::move(upload_progress_callback))
|
||||
.SetUrl(fetch_url)
|
||||
|
||||
@@ -727,7 +727,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util.
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -1626,6 +1626,7 @@ static_library("ui") {
|
||||
@@ -1630,6 +1630,7 @@ static_library("ui") {
|
||||
"//components/commerce/core/webui",
|
||||
"//components/contextual_search:public",
|
||||
"//components/endpoint_fetcher",
|
||||
@@ -735,7 +735,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
"//components/enterprise/common:files_scan_data",
|
||||
"//components/feedback/proto",
|
||||
"//components/headless/console_message_logger",
|
||||
@@ -4814,6 +4815,7 @@ static_library("ui") {
|
||||
@@ -4818,6 +4819,7 @@ static_library("ui") {
|
||||
"//components/power_bookmarks/core",
|
||||
"//components/power_bookmarks/storage",
|
||||
"//components/prefs",
|
||||
@@ -1224,7 +1224,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
|
||||
#include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
|
||||
#include "components/password_manager/core/browser/manage_passwords_referrer.h"
|
||||
#include "components/password_manager/core/common/password_manager_features.h"
|
||||
@@ -4190,6 +4194,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
||||
@@ -4200,6 +4204,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
||||
policy_indicator::AddLocalizedStrings(html_source);
|
||||
AddSecurityKeysStrings(html_source);
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@ Subject: Disable Real Box
|
||||
|
||||
Real-box is search box in ntp
|
||||
---
|
||||
chrome/browser/prefs/browser_prefs.cc | 2 +-
|
||||
.../browser/resources/new_tab_page/app.html | 19 -------------------
|
||||
.../searchbox/searchbox_handler.cc | 1 +
|
||||
components/search/ntp_features.cc | 4 ++--
|
||||
4 files changed, 4 insertions(+), 22 deletions(-)
|
||||
chrome/browser/prefs/browser_prefs.cc | 2 +-
|
||||
chrome/browser/resources/new_tab_page/app.html | 18 ------------------
|
||||
.../searchbox/searchbox_handler.cc | 1 +
|
||||
components/search/ntp_features.cc | 4 ++--
|
||||
4 files changed, 4 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -25,10 +25,10 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
|
||||
diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
|
||||
--- a/chrome/browser/resources/new_tab_page/app.html
|
||||
+++ b/chrome/browser/resources/new_tab_page/app.html
|
||||
@@ -41,25 +41,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
|
||||
?hidden="${!this.showScrim_}"></div>
|
||||
` : ''}
|
||||
<div id="searchboxContainer">
|
||||
@@ -43,24 +43,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
|
||||
<div id="searchboxContainer"
|
||||
@focusin="${this.onSearchboxContainerFocusIn_}"
|
||||
@focusout="${this.onSearchboxContainerFocusOut_}">
|
||||
- <cr-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
|
||||
- placeholder-text="$i18n{searchBoxPlaceholder}"
|
||||
- ?color-source-is-baseline="${this.colorSourceIsBaseline}"
|
||||
@@ -44,7 +44,6 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
|
||||
- searchbox-layout-mode="${this.realboxLayoutMode_}"
|
||||
- ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
|
||||
- ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
|
||||
- @searchbox-input-focus-changed="${this.onInputFocusChanged_}"
|
||||
- context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}"
|
||||
- ?multi-line-enabled="${this.multiLineEnabled_}">
|
||||
- </cr-searchbox>
|
||||
@@ -54,7 +53,7 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
|
||||
diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
|
||||
--- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
|
||||
@@ -298,6 +298,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
|
||||
@@ -306,6 +306,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
|
||||
Profile* profile,
|
||||
bool enable_voice_search,
|
||||
bool enable_lens_search) {
|
||||
@@ -65,7 +64,7 @@ diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.c
|
||||
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
|
||||
--- a/components/search/ntp_features.cc
|
||||
+++ b/components/search/ntp_features.cc
|
||||
@@ -114,7 +114,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -108,7 +108,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// If enabled, logo will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
@@ -74,7 +73,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
|
||||
|
||||
// If enabled, middle slot promo will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
@@ -156,7 +156,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -150,7 +150,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// If enabled, OneGoogleBar will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
|
||||
@@ -894,7 +894,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -5845,8 +5845,6 @@ if (!is_android) {
|
||||
@@ -5846,8 +5846,6 @@ if (!is_android) {
|
||||
"//chrome/browser/ui/exclusive_access:test_support",
|
||||
"//chrome/browser/ui/hats",
|
||||
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
|
||||
@@ -1363,7 +1363,7 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_f
|
||||
if (supported_countries == "*") {
|
||||
return true;
|
||||
}
|
||||
@@ -270,6 +272,7 @@ bool IsSupportedLocaleForFeature(
|
||||
@@ -273,6 +275,7 @@ bool IsSupportedLocaleForFeature(
|
||||
const std::string& locale,
|
||||
const base::Feature& feature,
|
||||
const std::string& default_value = "de,en,es,fr,it,nl,pt,tr") {
|
||||
@@ -1371,7 +1371,7 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_f
|
||||
if (!base::FeatureList::IsEnabled(feature)) {
|
||||
return false;
|
||||
}
|
||||
@@ -287,6 +290,7 @@ bool IsSupportedLocaleForFeature(
|
||||
@@ -290,6 +293,7 @@ bool IsSupportedLocaleForFeature(
|
||||
bool IsSupportedCountryForFeature(const std::string& country_code,
|
||||
const base::Feature& feature,
|
||||
const std::string& default_value) {
|
||||
@@ -1379,7 +1379,7 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_f
|
||||
if (!base::FeatureList::IsEnabled(feature)) {
|
||||
return false;
|
||||
}
|
||||
@@ -301,4 +305,7 @@ bool IsSupportedCountryForFeature(const std::string& country_code,
|
||||
@@ -304,4 +308,7 @@ bool IsSupportedCountryForFeature(const std::string& country_code,
|
||||
return IsSupportedCountry(country_code, value);
|
||||
}
|
||||
|
||||
@@ -1452,7 +1452,7 @@ diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
|
||||
diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc
|
||||
--- a/components/viz/service/gl/gpu_service_impl.cc
|
||||
+++ b/components/viz/service/gl/gpu_service_impl.cc
|
||||
@@ -657,24 +657,6 @@ void GpuServiceImpl::BindWebNNContextProvider(
|
||||
@@ -663,24 +663,6 @@ void GpuServiceImpl::BindWebNNContextProvider(
|
||||
std::move(pending_receiver), client_id));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
|
||||
<!--
|
||||
@@ -1231,9 +1230,6 @@ by a child template that "extends" this file.
|
||||
@@ -1224,9 +1223,6 @@ by a child template that "extends" this file.
|
||||
android:name="com.google.android.gms.cast.framework.ReconnectionService"
|
||||
tools:node="remove" />
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -509,15 +509,6 @@ by a child template that "extends" this file.
|
||||
@@ -502,15 +502,6 @@ by a child template that "extends" this file.
|
||||
android:excludeFromRecents="true"
|
||||
android:exported="false" />
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -1691,7 +1691,6 @@ if (_is_default_toolchain) {
|
||||
@@ -1693,7 +1693,6 @@ if (_is_default_toolchain) {
|
||||
java_group("chrome_public_non_pak_assets") {
|
||||
deps = [
|
||||
"//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
|
||||
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
Profile* profile = Profile::FromBrowserContext(browser_context);
|
||||
|
||||
auto* privacy_sandbox_settings =
|
||||
@@ -8080,7 +8083,7 @@ bool ChromeContentBrowserClient::ShouldDisableOriginAgentClusterDefault(
|
||||
@@ -8083,7 +8086,7 @@ bool ChromeContentBrowserClient::ShouldDisableOriginAgentClusterDefault(
|
||||
}
|
||||
|
||||
bool ChromeContentBrowserClient::WillProvidePublicFirstPartySets() {
|
||||
|
||||
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -2856,7 +2856,6 @@ if (_is_default_toolchain) {
|
||||
@@ -2858,7 +2858,6 @@ if (_is_default_toolchain) {
|
||||
"../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",
|
||||
"../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
|
||||
"../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
|
||||
|
||||
@@ -479,7 +479,7 @@ diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/p
|
||||
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -2211,6 +2211,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
@@ -2221,6 +2221,9 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
{"doNotTrackDialogMessage", IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT},
|
||||
{"doNotTrackDialogLearnMoreA11yLabel",
|
||||
IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_LEARN_MORE_ACCESSIBILITY_LABEL},
|
||||
|
||||
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -2047,9 +2047,9 @@
|
||||
@@ -2062,9 +2062,9 @@
|
||||
"expiry_milestone": 160
|
||||
},
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@ Full activation of incognito mode in experimental extension
|
||||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
.../chrome/browser/ChromeTabbedActivity.java | 37 +++++++-
|
||||
.../chrome/browser/app/ChromeActivity.java | 36 ++++++--
|
||||
.../chrome/browser/app/ChromeActivity.java | 34 +++++--
|
||||
.../customtabs/BaseCustomTabActivity.java | 2 +-
|
||||
.../BaseCustomTabRootUiCoordinator.java | 4 +-
|
||||
.../CustomTabIntentDataProvider.java | 3 +
|
||||
@@ -32,12 +32,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../extensions/ExtensionsMenuCoordinator.java | 7 +-
|
||||
.../extensions/ExtensionsMenuMediator.java | 14 ++-
|
||||
.../browser_window/ChromeAndroidTaskImpl.java | 3 +
|
||||
.../ChromeAndroidTaskTrackerFactory.java | 1 -
|
||||
.../ChromeAndroidTaskTrackerImpl.java | 90 ++++++++++++++-----
|
||||
.../ChromeAndroidTaskTracker.java | 7 +-
|
||||
components/tabs/impl/tab_collection.cc | 16 ++++
|
||||
components/tabs/impl/tab_strip_collection.cc | 4 +-
|
||||
31 files changed, 382 insertions(+), 95 deletions(-)
|
||||
30 files changed, 381 insertions(+), 93 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -188,15 +187,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
|
||||
if (chromeAndroidTask != null) {
|
||||
chromeAndroidTask.onNativeInitializationFinished();
|
||||
}
|
||||
@@ -2099,7 +2123,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
||||
&& DeviceFormFactor.isNonMultiDisplayContextOnTablet(this)) {
|
||||
HostZoomMap.setTransparentZoomAdjustment(
|
||||
ContentFeatureList.sAndroidMonitorZoomScalingFactor.getValue() / 100.0f);
|
||||
- } else if (DeviceInfo.isDesktop()) {
|
||||
+ } else if (DeviceInfo.isDesktopFalse()) {
|
||||
HostZoomMap.setTransparentZoomAdjustment(
|
||||
ContentFeatureList.sAndroidDesktopZoomScalingFactor.getValue() / 100.0f);
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
|
||||
@@ -1192,17 +1182,6 @@ diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chro
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java
|
||||
--- a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java
|
||||
+++ b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java
|
||||
@@ -21,7 +21,6 @@ public final class ChromeAndroidTaskTrackerFactory {
|
||||
public static ChromeAndroidTaskTracker getInstance() {
|
||||
// TODO(crbug.com/473636857): Remove once this is properly implemented on non-desktop
|
||||
// platforms.
|
||||
- if (!DeviceInfo.isDesktop()) return null;
|
||||
|
||||
return ChromeAndroidTaskTrackerImpl.getInstance();
|
||||
}
|
||||
diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerImpl.java b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerImpl.java
|
||||
--- a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerImpl.java
|
||||
+++ b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerImpl.java
|
||||
|
||||
@@ -435,7 +435,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
diff --git a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
|
||||
--- a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
|
||||
+++ b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc
|
||||
@@ -375,6 +375,9 @@ void PopulateChromeWebUIFrameBindersPartsDesktop(
|
||||
@@ -377,6 +377,9 @@ void PopulateChromeWebUIFrameBindersPartsDesktop(
|
||||
#endif // !BUILDFLAG(IS_CHROMEOS)
|
||||
>(map);
|
||||
|
||||
@@ -919,7 +919,7 @@ diff --git a/chrome/browser/search_engines/android/java/src/org/chromium/chrome/
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -680,7 +680,11 @@ static_library("ui") {
|
||||
@@ -682,7 +682,11 @@ static_library("ui") {
|
||||
if (is_desktop_android) {
|
||||
deps += [ "//chrome/browser/ui/android/extensions/windowing/internal" ]
|
||||
}
|
||||
@@ -932,7 +932,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
# TODO(crbug.com/413572035): Move into build files of the actual
|
||||
# modules depending on this. eg: autofill, user_education.
|
||||
if (is_chrome_branded) {
|
||||
@@ -1028,6 +1032,25 @@ static_library("ui") {
|
||||
@@ -1030,6 +1034,25 @@ static_library("ui") {
|
||||
"//extensions/browser:extension_action_enums",
|
||||
]
|
||||
}
|
||||
@@ -1375,7 +1375,7 @@ diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.h b/chrome/
|
||||
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -2871,6 +2871,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
|
||||
@@ -2881,6 +2881,8 @@ void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
|
||||
{"searchEnginesQueryURL", IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL},
|
||||
{"searchEnginesQueryURLExplanation",
|
||||
IDS_SETTINGS_SEARCH_ENGINES_QUERY_URL_EXPLANATION},
|
||||
@@ -1384,7 +1384,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
|
||||
{"searchEnginesMakeDefault", IDS_SETTINGS_SEARCH_ENGINES_MAKE_DEFAULT},
|
||||
{"searchEnginesActivate", IDS_SETTINGS_SEARCH_ENGINES_ACTIVATE},
|
||||
{"searchEnginesDeactivate", IDS_SETTINGS_SEARCH_ENGINES_DEACTIVATE},
|
||||
@@ -4184,7 +4186,11 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
||||
@@ -4194,7 +4196,11 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
||||
AddSiteSettingsStrings(html_source, profile);
|
||||
AddSiteDataPageStrings(html_source, profile);
|
||||
AddStorageAccessStrings(html_source);
|
||||
@@ -1921,7 +1921,7 @@ new file mode 100644
|
||||
diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
|
||||
--- a/components/search_engines/android/template_url_service_android.cc
|
||||
+++ b/components/search_engines/android/template_url_service_android.cc
|
||||
@@ -419,7 +419,7 @@ bool TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
|
||||
@@ -421,7 +421,7 @@ bool TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
|
||||
if (regulatory_api_turl->safe_for_autoreplace()) {
|
||||
template_url_service_->ResetTemplateURL(
|
||||
regulatory_api_turl, regulatory_api_turl->short_name(),
|
||||
|
||||
@@ -70,7 +70,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<!-- content URI support. -->
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
@@ -365,6 +359,10 @@ by a child template that "extends" this file.
|
||||
@@ -358,6 +352,10 @@ by a child template that "extends" this file.
|
||||
<action android:name="android.intent.action.MEDIA_SEARCH" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
</intent-filter>
|
||||
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<intent-filter>
|
||||
<action android:name="android.speech.action.VOICE_SEARCH_RESULTS" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
@@ -401,6 +399,24 @@ by a child template that "extends" this file.
|
||||
@@ -394,6 +392,24 @@ by a child template that "extends" this file.
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
|
||||
@@ -27,11 +27,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
.../java/res/layout/manage_space_activity.xml | 14 +++-
|
||||
.../java/res/xml/developer_preferences.xml | 6 ++
|
||||
.../browser/ChromeBaseAppCompatActivity.java | 2 +-
|
||||
.../chrome/browser/app/ChromeActivity.java | 2 +-
|
||||
.../AppMenuPropertiesDelegateImpl.java | 2 +-
|
||||
.../settings/AppearanceSettingsFragment.java | 2 +-
|
||||
.../overlays/strip/StripLayoutUtils.java | 2 +-
|
||||
.../DesktopSiteSettingsIphController.java | 2 +-
|
||||
.../MediaCaptureNotificationServiceImpl.java | 8 +--
|
||||
.../MediaCaptureNotificationServiceImpl.java | 4 +-
|
||||
.../browser/multiwindow/MultiWindowUtils.java | 2 +-
|
||||
.../ChromeSiteSettingsDelegate.java | 2 +-
|
||||
.../site_settings/ManageSpaceActivity.java | 20 ++++++
|
||||
@@ -105,6 +106,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
.../ExtensionsMenuItemProperties.java | 5 +-
|
||||
.../ExtensionsMenuItemViewBinder.java | 2 +
|
||||
.../extensions/ExtensionsMenuMediator.java | 10 ++-
|
||||
.../ChromeAndroidTaskTrackerFactory.java | 4 --
|
||||
chrome/browser/ui/prefs/BUILD.gn | 4 +-
|
||||
chrome/browser/ui/prefs/prefs_tab_helper.cc | 8 +--
|
||||
.../browser/ui/webui/chrome_web_ui_configs.cc | 4 +-
|
||||
@@ -183,7 +185,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
ui/webui/resources/cr_elements/BUILD.gn | 2 +-
|
||||
.../cr_elements/cr_toolbar/cr_toolbar.css | 6 ++
|
||||
ui/webui/resources/css/BUILD.gn | 2 +-
|
||||
171 files changed, 596 insertions(+), 305 deletions(-)
|
||||
173 files changed, 595 insertions(+), 308 deletions(-)
|
||||
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Enable-extensions-Android.grdp
|
||||
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Extensions-Android.grdp
|
||||
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Extensions-Android.inc
|
||||
@@ -362,7 +364,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
deps +=
|
||||
[ "//chrome/browser/ui/android/extensions/windowing/internal:java" ]
|
||||
} else {
|
||||
@@ -2298,7 +2298,7 @@ if (_is_default_toolchain) {
|
||||
@@ -2300,7 +2300,7 @@ if (_is_default_toolchain) {
|
||||
"//components/embedder_support/android:virtual_structure_javatests",
|
||||
]
|
||||
|
||||
@@ -432,6 +434,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
|
||||
applySingleThemeOverlay(R.style.ThemeOverlay_BrowserUI_DesktopDensity);
|
||||
}
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
|
||||
@@ -2099,7 +2099,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
|
||||
&& DeviceFormFactor.isNonMultiDisplayContextOnTablet(this)) {
|
||||
HostZoomMap.setTransparentZoomAdjustment(
|
||||
ContentFeatureList.sAndroidMonitorZoomScalingFactor.getValue() / 100.0f);
|
||||
- } else if (DeviceInfo.isDesktop()) {
|
||||
+ } else if (DeviceInfo.isDesktopFalse()) {
|
||||
HostZoomMap.setTransparentZoomAdjustment(
|
||||
ContentFeatureList.sAndroidDesktopZoomScalingFactor.getValue() / 100.0f);
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
|
||||
@@ -483,42 +497,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/desktop_site/De
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/MediaCaptureNotificationServiceImpl.java
|
||||
@@ -216,7 +216,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl
|
||||
}
|
||||
@@ -219,7 +219,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl
|
||||
}
|
||||
}
|
||||
- if (DeviceInfo.isDesktop()) {
|
||||
+ if (DeviceInfo.isDesktopFalse()) {
|
||||
if (mNotifications.size() > 1 && mNotifications.firstKey() == notificationId) {
|
||||
// For large screen device, we use the previous notification to update
|
||||
// foreground
|
||||
@@ -231,7 +231,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl
|
||||
}
|
||||
mNotificationManager.cancel(NOTIFICATION_NAMESPACE, notificationId);
|
||||
mNotificationsType.remove(notificationId);
|
||||
- if (DeviceInfo.isDesktop()) {
|
||||
+ if (DeviceInfo.isDesktopFalse()) {
|
||||
mNotifications.remove(notificationId);
|
||||
}
|
||||
updateSharedPreferencesEntry(notificationId, true);
|
||||
@@ -305,7 +305,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl
|
||||
appContext.getString(R.string.app_name),
|
||||
int lastIndex = mNotifications.size() - 1;
|
||||
boolean isRemovingLatestNotification =
|
||||
lastIndex >= 0 && mNotifications.get(lastIndex).first == notificationId;
|
||||
@@ -314,7 +314,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl
|
||||
contentIntent,
|
||||
stopIntent);
|
||||
mNotificationsType.put(notificationId, mediaTypes);
|
||||
- if (DeviceInfo.isDesktop()) {
|
||||
+ if (DeviceInfo.isDesktopFalse()) {
|
||||
// For large screen device, we use the latest notification to start or update
|
||||
// the foreground service.
|
||||
startOrUpdateForegroundService(notificationId, notification, mediaTypes);
|
||||
@@ -313,7 +313,7 @@ public class MediaCaptureNotificationServiceImpl extends SplitCompatService.Impl
|
||||
mNotificationManager.notify(notification);
|
||||
}
|
||||
mNotificationsType.put(notificationId, mediaTypes);
|
||||
- if (DeviceInfo.isDesktop()) {
|
||||
+ if (DeviceInfo.isDesktopFalse()) {
|
||||
mNotifications.put(notificationId, notification);
|
||||
}
|
||||
updateSharedPreferencesEntry(notificationId, false);
|
||||
startOrUpdateForegroundService(notificationId, notification);
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
|
||||
@@ -993,7 +989,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
if (matching_certificates.empty() && nonmatching_certificates.empty()) {
|
||||
extensions::ProcessMap* process_map =
|
||||
extensions::ProcessMap::Get(profile);
|
||||
@@ -4492,7 +4492,7 @@ void ChromeContentBrowserClient::OverrideWebPreferences(
|
||||
@@ -4495,7 +4495,7 @@ void ChromeContentBrowserClient::OverrideWebPreferences(
|
||||
// Fill font preferences. These are not registered on Android unless we're built
|
||||
// with extensions (the chrome.fontSettings API can change these).
|
||||
// - http://crbug.com/308033, http://crbug.com/696364.
|
||||
@@ -1599,7 +1595,7 @@ diff --git a/chrome/browser/task_manager/common/task_manager_features.cc b/chrom
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -681,7 +681,7 @@ static_library("ui") {
|
||||
@@ -683,7 +683,7 @@ static_library("ui") {
|
||||
}
|
||||
|
||||
# Desktop-Android-only dependencies.
|
||||
@@ -1608,7 +1604,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
deps += [ "//chrome/browser/ui/android/extensions/windowing/internal" ]
|
||||
}
|
||||
if (is_android) {
|
||||
@@ -2922,7 +2922,7 @@ static_library("ui") {
|
||||
@@ -2926,7 +2926,7 @@ static_library("ui") {
|
||||
allow_circular_includes_from += [ "//chrome/browser/ui/wallet" ]
|
||||
}
|
||||
|
||||
@@ -2222,6 +2218,20 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
|
||||
.with(
|
||||
ExtensionsMenuItemProperties.CLICK_LISTENER,
|
||||
(view) -> onPrimaryClick((ListMenuButton) view, actionId))
|
||||
diff --git a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java
|
||||
--- a/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java
|
||||
+++ b/chrome/browser/ui/browser_window/internal/android/java/src/org/chromium/chrome/browser/ui/browser_window/ChromeAndroidTaskTrackerFactory.java
|
||||
@@ -19,10 +19,6 @@ public final class ChromeAndroidTaskTrackerFactory {
|
||||
*/
|
||||
@Nullable
|
||||
public static ChromeAndroidTaskTracker getInstance() {
|
||||
- // TODO(crbug.com/473636857): Remove once this is properly implemented on non-desktop
|
||||
- // platforms.
|
||||
- if (!DeviceInfo.isDesktop()) return null;
|
||||
-
|
||||
return ChromeAndroidTaskTrackerImpl.getInstance();
|
||||
}
|
||||
}
|
||||
diff --git a/chrome/browser/ui/prefs/BUILD.gn b/chrome/browser/ui/prefs/BUILD.gn
|
||||
--- a/chrome/browser/ui/prefs/BUILD.gn
|
||||
+++ b/chrome/browser/ui/prefs/BUILD.gn
|
||||
@@ -2519,7 +2529,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
sources += [
|
||||
# These API tests can't be part of platform_browser_tests because they
|
||||
# run in interactive_ui_tests on Win/Mac/Linux.
|
||||
@@ -8111,7 +8111,7 @@ test("unit_tests") {
|
||||
@@ -8114,7 +8114,7 @@ test("unit_tests") {
|
||||
deps += [ "//chrome/browser/android/extensions:android" ]
|
||||
}
|
||||
|
||||
|
||||
@@ -250,7 +250,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//components/variations:variations_java",
|
||||
"//components/variations/android:variations_java",
|
||||
"//components/viz/service:service_java",
|
||||
@@ -1692,6 +1697,7 @@ if (_is_default_toolchain) {
|
||||
@@ -1694,6 +1699,7 @@ if (_is_default_toolchain) {
|
||||
java_group("chrome_public_non_pak_assets") {
|
||||
deps = [
|
||||
"//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
|
||||
|
||||
@@ -878,7 +878,7 @@ diff --git a/chrome/browser/adblock/android/java/src/org/chromium/chrome/browser
|
||||
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -6464,7 +6464,9 @@ ChromeContentBrowserClient::
|
||||
@@ -6467,7 +6467,9 @@ ChromeContentBrowserClient::
|
||||
}
|
||||
|
||||
bool ChromeContentBrowserClient::WillInterceptWebSocket(
|
||||
@@ -889,7 +889,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
|
||||
if (!frame) {
|
||||
return false;
|
||||
@@ -6487,9 +6489,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
|
||||
@@ -6490,9 +6492,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(
|
||||
}
|
||||
|
||||
void ChromeContentBrowserClient::CreateWebSocket(
|
||||
|
||||
@@ -286,7 +286,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
||||
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -2297,6 +2297,11 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
@@ -2307,6 +2307,11 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
IDS_SETTINGS_SAFEBROWSING_ENHANCED_THINGS_TO_CONSIDER_BULLET_THREE},
|
||||
{"safeBrowsingStandard", IDS_SETTINGS_SAFEBROWSING_STANDARD},
|
||||
{"safeBrowsingStandardDesc", IDS_SETTINGS_SAFEBROWSING_STANDARD_DESC},
|
||||
|
||||
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/Incog
|
||||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -5579,10 +5579,10 @@
|
||||
@@ -5599,10 +5599,10 @@
|
||||
"expiry_milestone": -1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -154,7 +154,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -642,6 +642,7 @@ static_library("ui") {
|
||||
@@ -644,6 +644,7 @@ static_library("ui") {
|
||||
"//third_party/re2",
|
||||
"//third_party/webrtc_overrides:webrtc_component",
|
||||
"//third_party/zlib",
|
||||
|
||||
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
} // namespace
|
||||
|
||||
base::OnceClosure ChromeContentBrowserClient::SelectClientCertificate(
|
||||
@@ -7662,12 +7687,17 @@ content::ContentBrowserClient::PrivateNetworkRequestPolicyOverride
|
||||
@@ -7665,12 +7690,17 @@ content::ContentBrowserClient::PrivateNetworkRequestPolicyOverride
|
||||
ChromeContentBrowserClient::ShouldOverridePrivateNetworkRequestPolicy(
|
||||
content::BrowserContext* browser_context,
|
||||
const url::Origin& origin) {
|
||||
|
||||
@@ -562,7 +562,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
|
||||
diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -2302,6 +2302,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
@@ -2312,6 +2312,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
|
||||
{"dayHistory", IDS_SETTINGS_DAY_HISTORY_DESCRIPTION},
|
||||
{"daysHistory", IDS_SETTINGS_DAYS_HISTORY_DESCRIPTION},
|
||||
{"foreverHistory", IDS_SETTINGS_FOREVER_HISTORY_DESCRIPTION},
|
||||
|
||||
@@ -181,7 +181,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//third_party/android_deps:protobuf_lite_runtime_java",
|
||||
"//third_party/android_media:android_media_java",
|
||||
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
|
||||
@@ -1903,7 +1892,6 @@ if (_is_default_toolchain) {
|
||||
@@ -1905,7 +1894,6 @@ if (_is_default_toolchain) {
|
||||
]
|
||||
deps = [
|
||||
":chrome_java",
|
||||
@@ -189,7 +189,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//base:base_java",
|
||||
"//base:base_java_test_support",
|
||||
"//build/android:build_java",
|
||||
@@ -2009,7 +1997,6 @@ if (_is_default_toolchain) {
|
||||
@@ -2011,7 +1999,6 @@ if (_is_default_toolchain) {
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
|
||||
@@ -197,7 +197,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
|
||||
@@ -2037,14 +2024,10 @@ if (_is_default_toolchain) {
|
||||
@@ -2039,14 +2026,10 @@ if (_is_default_toolchain) {
|
||||
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
|
||||
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/provider/PageContentProvider.java",
|
||||
@@ -212,7 +212,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//base:base_java",
|
||||
"//chrome/browser/autofill/android:third_party_provider_java",
|
||||
"//chrome/browser/download/android:file_provider_java",
|
||||
@@ -2063,7 +2046,6 @@ if (_is_default_toolchain) {
|
||||
@@ -2065,7 +2048,6 @@ if (_is_default_toolchain) {
|
||||
"//components/module_installer/android:module_installer_java",
|
||||
"//components/policy/android:policy_java",
|
||||
"//components/variations/android:variations_java",
|
||||
@@ -257,7 +257,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
|
||||
|
||||
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
|
||||
@@ -835,16 +830,6 @@ by a child template that "extends" this file.
|
||||
@@ -828,16 +823,6 @@ by a child template that "extends" this file.
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
@@ -274,7 +274,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<!-- This activity is used to restart the main Chrome process. Should never be exported. -->
|
||||
<activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
|
||||
android:launchMode="singleInstance"
|
||||
@@ -1016,18 +1001,6 @@ by a child template that "extends" this file.
|
||||
@@ -1009,18 +994,6 @@ by a child template that "extends" this file.
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
@@ -293,7 +293,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<!-- Android Notification service listener -->
|
||||
<service android:name="org.chromium.chrome.browser.notifications.NotificationService"
|
||||
android:exported="false"/>
|
||||
@@ -1380,12 +1353,6 @@ by a child template that "extends" this file.
|
||||
@@ -1373,12 +1346,6 @@ by a child template that "extends" this file.
|
||||
<uses-native-library android:name="libopenxr.google.so" android:required="false" />
|
||||
{% endif %}
|
||||
|
||||
@@ -727,7 +727,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
"webui/history_clusters/history_clusters_internals_ui_config.cc",
|
||||
"webui/history_clusters/history_clusters_internals_ui_config.h",
|
||||
"webui/interstitials/interstitial_ui.cc",
|
||||
@@ -473,7 +471,6 @@ static_library("ui") {
|
||||
@@ -475,7 +473,6 @@ static_library("ui") {
|
||||
"//components/feedback/content",
|
||||
"//components/feedback/redaction_tool",
|
||||
"//components/find_in_page",
|
||||
@@ -747,7 +747,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr
|
||||
"//base:base_java",
|
||||
"//base/version_info/android:version_constants_java",
|
||||
"//build/android:build_java",
|
||||
@@ -521,8 +519,6 @@ robolectric_library("junit") {
|
||||
@@ -522,8 +520,6 @@ robolectric_library("junit") {
|
||||
deps = [
|
||||
":java",
|
||||
":java_resources",
|
||||
@@ -3059,7 +3059,7 @@ diff --git a/components/module_installer/android/BUILD.gn b/components/module_in
|
||||
diff --git a/components/omnibox/common/BUILD.gn b/components/omnibox/common/BUILD.gn
|
||||
--- a/components/omnibox/common/BUILD.gn
|
||||
+++ b/components/omnibox/common/BUILD.gn
|
||||
@@ -58,7 +58,6 @@ if (is_android) {
|
||||
@@ -60,7 +60,6 @@ if (is_android) {
|
||||
":jni_headers",
|
||||
]
|
||||
deps = [
|
||||
@@ -3079,7 +3079,7 @@ diff --git a/components/omnibox/common/android/java/src/org/chromium/components/
|
||||
import org.chromium.base.BaseSwitches;
|
||||
import org.chromium.base.CommandLine;
|
||||
import org.chromium.base.ContextUtils;
|
||||
@@ -192,12 +190,6 @@ public class OmniboxFeatures {
|
||||
@@ -199,12 +197,6 @@ public class OmniboxFeatures {
|
||||
"geolocation_request_min_update_interval_millis",
|
||||
(int) (9 * DateUtils.MINUTE_IN_MILLIS));
|
||||
|
||||
|
||||
@@ -913,7 +913,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
initializeSearchBoxTextView();
|
||||
initializeVoiceSearchButton();
|
||||
initializeLensButton();
|
||||
@@ -784,8 +790,8 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -785,8 +791,8 @@ public class NewTabPageLayout extends LinearLayout
|
||||
private void calculateTabletMvtWidth(int totalWidth) {
|
||||
if (mMvTilesContainerLayout.getVisibility() == GONE) return;
|
||||
|
||||
@@ -924,7 +924,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
updateMvtOnTablet();
|
||||
}
|
||||
|
||||
@@ -835,7 +841,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -836,7 +842,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
&& mInitialized) {
|
||||
return;
|
||||
}
|
||||
@@ -933,7 +933,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
mSearchProviderIsGoogle = isGoogle;
|
||||
|
||||
if (!mSearchProviderIsGoogle) {
|
||||
@@ -879,6 +885,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -880,6 +886,7 @@ public class NewTabPageLayout extends LinearLayout
|
||||
* @param disable Whether to disable the animations.
|
||||
*/
|
||||
void setUrlFocusAnimationsDisabled(boolean disable) {
|
||||
@@ -941,7 +941,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
if (disable == mDisableUrlFocusChangeAnimations) return;
|
||||
mDisableUrlFocusChangeAnimations = disable;
|
||||
if (!disable) onUrlFocusAnimationChanged();
|
||||
@@ -1280,6 +1287,22 @@ public class NewTabPageLayout extends LinearLayout
|
||||
@@ -1281,6 +1288,22 @@ public class NewTabPageLayout extends LinearLayout
|
||||
return mMostVisitedTilesCoordinator;
|
||||
}
|
||||
|
||||
@@ -1621,7 +1621,7 @@ diff --git a/components/ntp_tiles/custom_links_store.cc b/components/ntp_tiles/c
|
||||
diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
|
||||
--- a/components/omnibox/common/omnibox_features.cc
|
||||
+++ b/components/omnibox/common/omnibox_features.cc
|
||||
@@ -187,6 +187,7 @@ BASE_FEATURE(kRemoveSearchReadyOmnibox, DISABLED);
|
||||
@@ -192,6 +192,7 @@ BASE_FEATURE(kRemoveSearchReadyOmnibox, DISABLED);
|
||||
BASE_FEATURE(kDefaultTypedNavigationsToHttps,
|
||||
"OmniboxDefaultTypedNavigationsToHttps",
|
||||
enable_if(IS_IOS));
|
||||
@@ -1629,7 +1629,7 @@ diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/
|
||||
|
||||
// Override the delay to create a spare renderer when the omnibox is focused
|
||||
// on Android.
|
||||
@@ -273,6 +274,7 @@ BASE_FEATURE(kOmniboxMobileParityUpdate, ENABLED);
|
||||
@@ -278,6 +279,7 @@ BASE_FEATURE(kOmniboxMobileParityUpdate, ENABLED);
|
||||
// Updates various NTP/Omnibox assets and descriptions for visual alignment on
|
||||
// Android and iOS, V2.
|
||||
BASE_FEATURE(kOmniboxMobileParityUpdateV2, ENABLED);
|
||||
|
||||
@@ -196,7 +196,7 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -487,10 +487,9 @@ by a child template that "extends" this file.
|
||||
@@ -480,10 +480,9 @@ by a child template that "extends" this file.
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -2318,6 +2318,10 @@
|
||||
@@ -2338,6 +2338,10 @@
|
||||
"yangsharon@google.com", "alexmos@google.com", "creis@google.com" ],
|
||||
"expiry_milestone": 150
|
||||
},
|
||||
|
||||
@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -11700,9 +11700,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -11647,9 +11647,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(::features::kBlockRootWindowAccessibleNameChangeEvent)},
|
||||
#endif // BUILDFLAG(IS_MAC)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Temp disable experimental-web-platform-features
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -5494,10 +5494,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5428,10 +5428,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
|
||||
flag_descriptions::kGpuRasterizationDescription, kOsAll,
|
||||
MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
|
||||
|
||||
@@ -983,7 +983,7 @@ diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
|
||||
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
|
||||
--- a/components/search/ntp_features.cc
|
||||
+++ b/components/search/ntp_features.cc
|
||||
@@ -86,6 +86,7 @@ BASE_FEATURE(kNtpCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -80,6 +80,7 @@ BASE_FEATURE(kNtpCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// If enabled, chrome cart module will be shown.
|
||||
BASE_FEATURE(kNtpChromeCartModule, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -113,7 +113,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
"//components/test/data/autofill/",
|
||||
"//components/test/data/payments/",
|
||||
"//content/test/data/browsing_data/",
|
||||
@@ -3054,6 +3059,12 @@ if (_is_default_toolchain) {
|
||||
@@ -3056,6 +3061,12 @@ if (_is_default_toolchain) {
|
||||
sources += [ "java/src/org/chromium/chrome/browser/media/MediaCapturePickerManagerBridge.java" ]
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
# Used for testing only, should not be shipped to end users.
|
||||
if (enable_offline_pages_harness) {
|
||||
sources += [ "java/src/org/chromium/chrome/browser/offlinepages/evaluation/OfflinePageEvaluationBridge.java" ]
|
||||
@@ -3146,6 +3157,7 @@ if (_is_default_toolchain) {
|
||||
@@ -3148,6 +3159,7 @@ if (_is_default_toolchain) {
|
||||
"//chrome/browser/ui/plus_addresses/android:jni_headers",
|
||||
"//chrome/browser/util:jni_headers",
|
||||
"//chrome/browser/webauthn/android:jni_headers",
|
||||
@@ -261,7 +261,7 @@ new file mode 100644
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -1055,6 +1055,12 @@ static_library("ui") {
|
||||
@@ -1057,6 +1057,12 @@ static_library("ui") {
|
||||
deps += [
|
||||
"//components/themes:ntp_background_proto",
|
||||
]
|
||||
|
||||
@@ -51776,7 +51776,7 @@ diff --git a/tools/metrics/histograms/metadata/extensions/enums.xml b/tools/metr
|
||||
<int value="23" label="DELETED_AUDIO_MODEM_ON_TRANSMIT_FAIL"/>
|
||||
<int value="24" label="DELETED_AUDIO_ON_DEVICE_CHANGED"/>
|
||||
<int value="25" label="AUDIO_ON_DEVICES_CHANGED"/>
|
||||
@@ -3260,6 +3264,8 @@ Called by update_extension_permission.py.-->
|
||||
@@ -3266,6 +3270,8 @@ Called by update_extension_permission.py.-->
|
||||
<int value="261" label="kOmniboxDirectInput"/>
|
||||
<int value="262" label="kExperimentalActor"/>
|
||||
<int value="263" label="kEnterpriseLogin"/>
|
||||
|
||||
@@ -376,7 +376,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
|
||||
import("//build/config/buildflags_paint_preview.gni")
|
||||
import("//build/config/compiler/compiler.gni")
|
||||
@@ -411,6 +414,7 @@ static_library("ui") {
|
||||
@@ -413,6 +416,7 @@ static_library("ui") {
|
||||
"//chrome/installer/util:with_no_strings",
|
||||
"//components/access_code_cast/common:metrics",
|
||||
"//components/account_id",
|
||||
|
||||
@@ -218,7 +218,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
switches::kJavaScriptHarmony,
|
||||
switches::kEnableExperimentalWebAssemblyFeatures,
|
||||
embedder_support::kOriginTrialDisabledFeatures,
|
||||
@@ -5727,7 +5726,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) {
|
||||
@@ -5730,7 +5729,8 @@ GetClientDataHeader(content::FrameTreeNodeId frame_tree_node_id) {
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -228,7 +228,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
const std::string& client_data_header,
|
||||
#endif
|
||||
@@ -5767,7 +5767,7 @@ std::unique_ptr<blink::URLLoaderThrottle> CreateGoogleURLLoaderThrottle(
|
||||
@@ -5770,7 +5770,7 @@ std::unique_ptr<blink::URLLoaderThrottle> CreateGoogleURLLoaderThrottle(
|
||||
std::move(bound_session_request_throttled_handler),
|
||||
#endif
|
||||
std::move(dynamic_params));
|
||||
@@ -237,7 +237,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
|
||||
std::vector<std::unique_ptr<blink::URLLoaderThrottle>>
|
||||
ChromeContentBrowserClient::CreateURLLoaderThrottles(
|
||||
@@ -5824,15 +5824,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
|
||||
@@ -5827,15 +5827,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
|
||||
GetClientDataHeader(frame_tree_node_id);
|
||||
#endif
|
||||
|
||||
@@ -253,7 +253,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
{
|
||||
auto* factory =
|
||||
ProtocolHandlerRegistryFactory::GetForBrowserContext(browser_context);
|
||||
@@ -5877,20 +5868,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
|
||||
@@ -5880,20 +5871,6 @@ ChromeContentBrowserClient::CreateURLLoaderThrottlesForKeepAlive(
|
||||
Profile* profile = Profile::FromBrowserContext(browser_context);
|
||||
DCHECK(profile);
|
||||
|
||||
@@ -778,7 +778,7 @@ diff --git a/chrome/browser/signin/android/signin_manager_android.cc b/chrome/br
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -297,7 +297,6 @@ static_library("ui") {
|
||||
@@ -299,7 +299,6 @@ static_library("ui") {
|
||||
"//chrome/browser/feedback:feedback_impl",
|
||||
"//chrome/browser/file_system_access",
|
||||
"//chrome/browser/gcm",
|
||||
@@ -900,7 +900,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
@@ -773,12 +773,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
|
||||
@@ -779,12 +779,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
|
||||
// chrome-untrusted://new-tab-page for other external content and resources.
|
||||
// NOTE: Use caution when overriding content security policies as that cean
|
||||
// lead to subtle security bugs such as https://crbug.com/1251541.
|
||||
@@ -1010,7 +1010,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
|
||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||
--- a/chrome/test/BUILD.gn
|
||||
+++ b/chrome/test/BUILD.gn
|
||||
@@ -6995,7 +6995,6 @@ test("unit_tests") {
|
||||
@@ -6997,7 +6997,6 @@ test("unit_tests") {
|
||||
"//chrome/browser/first_party_sets",
|
||||
"//chrome/browser/gcm",
|
||||
"//chrome/browser/gcm:unit_tests",
|
||||
|
||||
Reference in New Issue
Block a user