Merge pull request #51 from uazo/create-pull-request/patch-7b743af
Git apply result for next-v113 branch
This commit is contained in:
@@ -11185,7 +11185,7 @@ diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chro
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@@ -265,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
|
||||
@@ -266,7 +276,7 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
|
||||
"UkmBackgroundRecorderService",
|
||||
"UsbDeviceManager",
|
||||
"UsbDeviceResourceManager",
|
||||
@@ -11194,7 +11194,7 @@ diff --git a/chrome/browser/profiles/profile_keyed_service_browsertest.cc b/chro
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@@ -521,6 +531,17 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
|
||||
@@ -522,6 +532,17 @@ IN_PROC_BROWSER_TEST_F(ProfileKeyedServiceBrowserTest,
|
||||
"feedback::FeedbackUploaderChrome",
|
||||
"sct_reporting::Factory",
|
||||
"ZeroSuggestCacheServiceFactory",
|
||||
@@ -173697,7 +173697,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
|
||||
#include "content/browser/renderer_host/render_frame_host_impl.h"
|
||||
|
||||
@@ -2570,6 +2574,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
@@ -2571,6 +2575,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
std::move(callback));
|
||||
}
|
||||
|
||||
@@ -173710,7 +173710,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
void RenderFrameHostImpl::ExecuteJavaScript(const std::u16string& javascript,
|
||||
JavaScriptResultCallback callback) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -10614,7 +10624,6 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryInternal(
|
||||
@@ -10654,7 +10664,6 @@ bool RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryInternal(
|
||||
|
||||
GetProcess()->CreateURLLoaderFactory(std::move(default_factory_receiver),
|
||||
std::move(params));
|
||||
|
||||
@@ -13,7 +13,7 @@ Adds restrict-gamepad-access flag (default active) to disable GamePad API.
|
||||
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
|
||||
@@ -6360,9 +6360,9 @@
|
||||
@@ -6370,9 +6370,9 @@
|
||||
"expiry_milestone": 120
|
||||
},
|
||||
{
|
||||
|
||||
@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
|
||||
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
|
||||
@@ -7398,6 +7398,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7402,6 +7402,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kMoveTopToolbarToBottomDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kMoveTopToolbarToBottom)},
|
||||
|
||||
@@ -311,7 +311,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -964,6 +964,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext,
|
||||
@@ -971,6 +971,10 @@ BASE_FEATURE(kScopeMemoryCachePerContext,
|
||||
"ScopeMemoryCachePerContext",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -325,7 +325,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -420,6 +420,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kScopeMemoryCachePerContext);
|
||||
@@ -421,6 +421,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kScopeMemoryCachePerContext);
|
||||
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kEnablePenetratingImageSelection);
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ to enable it.
|
||||
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
|
||||
@@ -6979,6 +6979,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6983,6 +6983,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kFileHandlingIconsDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(blink::features::kFileHandlingIcons)},
|
||||
|
||||
@@ -74,7 +74,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -1509,6 +1509,10 @@ BASE_FEATURE(kStylusPointerAdjustment,
|
||||
@@ -1516,6 +1516,10 @@ BASE_FEATURE(kStylusPointerAdjustment,
|
||||
"StylusPointerAdjustment",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -88,7 +88,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -787,6 +787,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAndroidExtendedKeyboardShortcuts);
|
||||
@@ -788,6 +788,8 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAndroidExtendedKeyboardShortcuts);
|
||||
// enabling functions like writing into a nearby input element.
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kStylusPointerAdjustment);
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ fonts-fingerprint-mitigation flag, which is active by default.
|
||||
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
|
||||
@@ -9461,6 +9461,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9465,6 +9465,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kClipboardUnsanitizedContentDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(blink::features::kClipboardUnsanitizedContent)},
|
||||
|
||||
@@ -155,7 +155,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
|
||||
// Enable defer commits to avoid flash of unstyled content, for same origin
|
||||
// navigation only.
|
||||
@@ -1521,6 +1521,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent,
|
||||
@@ -1528,6 +1528,10 @@ BASE_FEATURE(kClipboardUnsanitizedContent,
|
||||
"ClipboardUnsanitizedContent",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -169,7 +169,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -804,6 +804,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kCheckHTMLParserBudgetLessOften);
|
||||
@@ -805,6 +805,9 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kCheckHTMLParserBudgetLessOften);
|
||||
// it is only applicable to HTML format. See crbug.com/1268679.
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kClipboardUnsanitizedContent);
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "services/media_session/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
#include "services/network/public/cpp/network_switches.h"
|
||||
@@ -7599,6 +7600,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7603,6 +7604,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(page_info::kPageInfoHideSiteSettings)},
|
||||
#endif // !BUILDFLAG(IS_ANDROID)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ keyboard events.
|
||||
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
|
||||
@@ -4713,6 +4713,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4717,6 +4717,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
|
||||
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
|
||||
|
||||
@@ -34,7 +34,7 @@ The feature is controlled by a feature flag (default enabled)
|
||||
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
|
||||
@@ -7535,6 +7535,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7539,6 +7539,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(paint_preview::kPaintPreviewDemo)},
|
||||
#endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -49,7 +49,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -6795,6 +6795,12 @@ const char kPaintPreviewDemoDescription[] =
|
||||
@@ -6801,6 +6801,12 @@ const char kPaintPreviewDemoDescription[] =
|
||||
"previews.";
|
||||
#endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3953,6 +3953,9 @@ extern const char kPaintPreviewDemoName[];
|
||||
@@ -3956,6 +3956,9 @@ extern const char kPaintPreviewDemoName[];
|
||||
extern const char kPaintPreviewDemoDescription[];
|
||||
#endif // ENABLE_PAINT_PREVIEW && BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -911,6 +911,9 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam<
|
||||
@@ -912,6 +912,9 @@ BLINK_COMMON_EXPORT extern const base::FeatureParam<
|
||||
// base url inheritance behavior from https://crbug.com/1356658.
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kNewBaseUrlInheritanceBehavior);
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Add AllowUserCertificates flag
|
||||
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
|
||||
@@ -8676,10 +8676,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8680,10 +8680,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ Subject: WIN ADDTO Add bookmark import/export actions
|
||||
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
|
||||
@@ -8888,11 +8888,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8892,11 +8892,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
|
||||
#endif
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ Subject: WIN ADDTO Add flag to disable IPv6 probes
|
||||
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
|
||||
@@ -6111,7 +6111,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6115,7 +6115,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"ipv6-probing",
|
||||
flag_descriptions::kIPv6ProbingName,
|
||||
flag_descriptions::kIPv6ProbingDescription, kOsAll,
|
||||
|
||||
@@ -160,7 +160,7 @@ diff --git a/chrome/browser/download/bubble/download_bubble_ui_controller.cc b/c
|
||||
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
@@ -204,9 +203,11 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
|
||||
@@ -202,9 +201,11 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
|
||||
commands.ExecuteCommand(command);
|
||||
break;
|
||||
case DownloadCommands::REVIEW:
|
||||
|
||||
@@ -42,7 +42,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
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
|
||||
@@ -7642,9 +7642,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7646,9 +7646,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Restore Search Ready Omnibox flag
|
||||
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
|
||||
@@ -8867,9 +8867,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8871,9 +8871,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDesksTemplatesDescription, kOsCrOS,
|
||||
FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)},
|
||||
#endif
|
||||
|
||||
@@ -111,7 +111,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
|
||||
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
|
||||
@@ -7412,6 +7412,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7416,6 +7416,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDevicePostureDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kDevicePosture)},
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
|
||||
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
|
||||
@@ -2603,9 +2603,9 @@
|
||||
@@ -2608,9 +2608,9 @@
|
||||
"expiry_milestone": 115
|
||||
},
|
||||
{
|
||||
|
||||
@@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom
|
||||
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
|
||||
@@ -8617,6 +8617,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8621,6 +8621,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -8819,6 +8819,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8823,6 +8823,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kRequestDesktopSiteExceptionsName,
|
||||
flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
|
||||
|
||||
@@ -311,7 +311,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
import org.chromium.chrome.browser.banners.AppMenuVerbiage;
|
||||
import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
|
||||
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
|
||||
@@ -102,6 +103,10 @@ import java.util.ArrayList;
|
||||
@@ -105,6 +106,10 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -322,7 +322,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
/**
|
||||
* Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
|
||||
* items based on activity state.
|
||||
@@ -560,6 +565,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -563,6 +568,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
}
|
||||
|
||||
private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
|
||||
@@ -336,7 +336,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
// We have to iterate all menu items since same menu item ID may be associated with more
|
||||
// than one menu items.
|
||||
boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
|
||||
@@ -635,7 +647,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -638,7 +650,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
}
|
||||
|
||||
if (item.getItemId() == R.id.recent_tabs_menu_id) {
|
||||
@@ -353,7 +353,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
}
|
||||
if (item.getItemId() == R.id.menu_group_tabs) {
|
||||
item.setVisible(isMenuGroupTabsVisible);
|
||||
@@ -853,7 +873,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -856,7 +876,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
// is not persisted when adding to the homescreen.
|
||||
// * If creating shortcuts it not supported by the current home screen.
|
||||
return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme
|
||||
@@ -1097,7 +1097,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
@@ -37,6 +37,7 @@ import org.chromium.base.supplier.OneshotSupplier;
|
||||
@@ -38,6 +38,7 @@ import org.chromium.base.supplier.OneshotSupplier;
|
||||
import org.chromium.base.supplier.Supplier;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.ActivityTabProvider;
|
||||
@@ -1105,7 +1105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
import org.chromium.chrome.browser.IntentHandler;
|
||||
import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
|
||||
import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
|
||||
@@ -496,7 +497,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -500,7 +501,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
return ret;
|
||||
}
|
||||
},
|
||||
@@ -1163,7 +1163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
|
||||
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
|
||||
@@ -4706,6 +4706,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4710,6 +4710,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kOfflinePagesLivePageSharingName,
|
||||
flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
|
||||
@@ -1311,7 +1311,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -3891,6 +3891,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
|
||||
@@ -3897,6 +3897,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
|
||||
"Enables to share current loaded page as offline page by saving as MHTML "
|
||||
"first.";
|
||||
|
||||
@@ -1327,7 +1327,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2238,6 +2238,9 @@ extern const char kNotificationPermissionRationaleBottomSheetDescription[];
|
||||
@@ -2241,6 +2241,9 @@ extern const char kNotificationPermissionRationaleBottomSheetDescription[];
|
||||
extern const char kOfflinePagesLivePageSharingName[];
|
||||
extern const char kOfflinePagesLivePageSharingDescription[];
|
||||
|
||||
|
||||
@@ -840,7 +840,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
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
|
||||
@@ -8785,6 +8785,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8789,6 +8789,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
|
||||
#endif
|
||||
|
||||
@@ -1352,7 +1352,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -6790,6 +6790,11 @@ const char kPromiseIconsDescription[] =
|
||||
@@ -6796,6 +6796,11 @@ const char kPromiseIconsDescription[] =
|
||||
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@@ -1367,7 +1367,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3951,6 +3951,9 @@ extern const char kPromiseIconsDescription[];
|
||||
@@ -3954,6 +3954,9 @@ extern const char kPromiseIconsDescription[];
|
||||
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -4871,7 +4871,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4875,7 +4875,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
|
||||
flag_descriptions::kForceTextDirectionDescription, kOsAll,
|
||||
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
|
||||
|
||||
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
const FeatureEntry::Choice kMemlogModeChoices[] = {
|
||||
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
|
||||
{flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
|
||||
@@ -4749,6 +4754,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4753,6 +4758,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kVideoTutorialsInstantFetchName,
|
||||
flag_descriptions::kVideoTutorialsInstantFetchDescription, kOsAndroid,
|
||||
SINGLE_VALUE_TYPE(video_tutorials::switches::kVideoTutorialsInstantFetch)},
|
||||
|
||||
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -6060,6 +6060,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6064,6 +6064,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
|
||||
flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
|
||||
|
||||
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -3954,6 +3954,12 @@ const char kPolicyLogsPageAndroidDescription[] =
|
||||
@@ -3960,6 +3960,12 @@ const char kPolicyLogsPageAndroidDescription[] =
|
||||
"Enable the new chrome://policy-logs page containing logs for debugging "
|
||||
"policy related issues on Android.";
|
||||
|
||||
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2285,6 +2285,9 @@ extern const char kQueryTilesNTPDescription[];
|
||||
@@ -2288,6 +2288,9 @@ extern const char kQueryTilesNTPDescription[];
|
||||
extern const char kQueryTilesOnStartName[];
|
||||
extern const char kQueryTilesOnStartDescription[];
|
||||
extern const char kQueryTilesSingleTierName[];
|
||||
|
||||
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -7424,6 +7424,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7428,6 +7428,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
|
||||
#endif
|
||||
|
||||
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -6433,6 +6433,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] =
|
||||
@@ -6439,6 +6439,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] =
|
||||
"moveBy, moveTo or session restore.";
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3943,6 +3943,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
|
||||
@@ -3946,6 +3946,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
|
||||
extern const char kWebUITabStripTabDragIntegrationDescription[];
|
||||
#endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
|
||||
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
|
||||
@@ -545,6 +545,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -548,6 +548,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
|
||||
|
||||
updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
|
||||
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
|
||||
updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
|
||||
|
||||
@@ -1170,6 +1171,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -1173,6 +1174,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
stopPriceTrackingMenuItem.setVisible(false);
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "components/shared_highlighting/core/common/shared_highlighting_features.h"
|
||||
#include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
|
||||
#include "components/signin/public/base/signin_buildflags.h"
|
||||
@@ -8870,6 +8871,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8874,6 +8875,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kLargeFaviconFromGoogleVariations,
|
||||
"LargeFaviconFromGoogle")},
|
||||
|
||||
|
||||
@@ -198,7 +198,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -12790,12 +12790,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
@@ -12830,12 +12830,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
base::Value::Dict body;
|
||||
if (!reason.empty())
|
||||
body.Set("reason", reason);
|
||||
|
||||
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -657,6 +657,10 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions,
|
||||
@@ -664,6 +664,10 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions,
|
||||
#endif
|
||||
);
|
||||
|
||||
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -272,6 +272,8 @@ BLINK_COMMON_EXPORT bool IsPlzDedicatedWorkerEnabled();
|
||||
@@ -273,6 +273,8 @@ BLINK_COMMON_EXPORT bool IsPlzDedicatedWorkerEnabled();
|
||||
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebRtcUseMinMaxVEADimensions);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -4906,6 +4906,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4910,6 +4910,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName,
|
||||
flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)},
|
||||
|
||||
@@ -85,7 +85,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
|
||||
--- a/components/omnibox/browser/autocomplete_controller.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_controller.cc
|
||||
@@ -1577,5 +1577,7 @@ bool AutocompleteController::MaybeRunUrlScoringModel(
|
||||
@@ -1579,5 +1579,7 @@ bool AutocompleteController::MaybeRunUrlScoringModel(
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -308,7 +308,7 @@ diff --git a/components/permissions/features.cc b/components/permissions/feature
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -232,12 +232,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
|
||||
@@ -239,12 +239,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
|
||||
// in the first viewport after the page load and the metrics of the clicked
|
||||
// anchor element will be extracted and recorded.
|
||||
BASE_FEATURE(kNavigationPredictor,
|
||||
|
||||
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -6315,6 +6315,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6319,6 +6319,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
"")},
|
||||
#endif
|
||||
|
||||
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
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
|
||||
@@ -2826,6 +2826,11 @@
|
||||
@@ -2831,6 +2831,11 @@
|
||||
"owners": [ "robsc", "napper", "alanlxl" ],
|
||||
"expiry_milestone": 130
|
||||
},
|
||||
@@ -103,7 +103,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -513,6 +513,11 @@ BASE_FEATURE(kDroppedTouchSequenceIncludesTouchEnd,
|
||||
@@ -520,6 +520,11 @@ BASE_FEATURE(kDroppedTouchSequenceIncludesTouchEnd,
|
||||
"DroppedTouchSequenceIncludesTouchEnd",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -246,6 +246,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV);
|
||||
@@ -247,6 +247,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV);
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV);
|
||||
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption);
|
||||
|
||||
@@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
|
||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -7971,7 +7971,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
|
||||
@@ -7978,7 +7978,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
|
||||
void NavigationRequest::ForceEnableOriginTrials(
|
||||
const std::vector<std::string>& trials) {
|
||||
DCHECK(!HasCommitted());
|
||||
|
||||
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -8822,6 +8822,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8826,6 +8826,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebMidiDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kWebMidi)},
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -53,7 +53,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -6822,6 +6822,10 @@ const char kAutofillCreditCardUploadDescription[] =
|
||||
@@ -6828,6 +6828,10 @@ const char kAutofillCreditCardUploadDescription[] =
|
||||
#endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
|
||||
@@ -67,7 +67,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3974,6 +3974,9 @@ extern const char kAutofillCreditCardUploadDescription[];
|
||||
@@ -3977,6 +3977,9 @@ extern const char kAutofillCreditCardUploadDescription[];
|
||||
#endif // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -4413,9 +4413,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4417,9 +4417,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(
|
||||
site_isolation::features::kSiteIsolationForPasswordSites)},
|
||||
|
||||
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -526,8 +526,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal,
|
||||
@@ -533,8 +533,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal,
|
||||
// Prefetch request properties are updated to be privacy-preserving. See
|
||||
// crbug.com/988956.
|
||||
BASE_FEATURE(kPrefetchPrivacyChanges,
|
||||
|
||||
@@ -371,7 +371,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -9242,6 +9242,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9246,6 +9246,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif // !BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -344,7 +344,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "components/version_info/version_info.h"
|
||||
#include "components/viz/common/features.h"
|
||||
#include "components/viz/common/switches.h"
|
||||
@@ -7629,6 +7630,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7633,6 +7634,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryNudgeSessionReset)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@@ -358,7 +358,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -6657,6 +6657,11 @@ const char kLocalWebApprovalsDescription[] =
|
||||
@@ -6663,6 +6663,11 @@ const char kLocalWebApprovalsDescription[] =
|
||||
"refresh needs to also be enabled.";
|
||||
#endif
|
||||
|
||||
@@ -373,7 +373,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3843,6 +3843,9 @@ extern const char kQuickCommandsDescription[];
|
||||
@@ -3846,6 +3846,9 @@ extern const char kQuickCommandsDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// defined (OS_FUCHSIA)
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -1236,8 +1236,8 @@ BASE_FEATURE(kDurableClientHintsCache,
|
||||
@@ -1243,8 +1243,8 @@ BASE_FEATURE(kDurableClientHintsCache,
|
||||
const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
|
||||
&kReduceUserAgentMinorVersion, "build_version", "0"};
|
||||
|
||||
|
||||
@@ -15,7 +15,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
|
||||
@@ -4389,9 +4389,9 @@
|
||||
@@ -4399,9 +4399,9 @@
|
||||
"expiry_milestone": 115
|
||||
},
|
||||
{
|
||||
|
||||
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "components/browser_sync/browser_sync_switches.h"
|
||||
#include "components/browser_ui/settings/android/features.h"
|
||||
#include "components/browser_ui/site_settings/android/features.h"
|
||||
@@ -5960,6 +5961,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5964,6 +5965,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
reading_list::switches::kReadLaterReminderNotification)},
|
||||
#endif
|
||||
|
||||
@@ -324,7 +324,7 @@ diff --git a/components/signin/internal/identity_manager/primary_account_manager
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -1612,8 +1612,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread,
|
||||
@@ -1619,8 +1619,8 @@ BASE_FEATURE(kWebRtcCombinedNetworkAndWorkerThread,
|
||||
// the attribute. Note: At present, only iframes with origin-restricted
|
||||
// sandboxes are isolated.
|
||||
BASE_FEATURE(kIsolateSandboxedIframes,
|
||||
|
||||
@@ -1455,7 +1455,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
@@ -173,6 +173,9 @@ import org.chromium.url.GURL;
|
||||
@@ -177,6 +177,9 @@ import org.chromium.url.GURL;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1465,7 +1465,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
/**
|
||||
* Contains logic for managing the toolbar visual component. This class manages the interactions
|
||||
* with the rest of the application to ensure the toolbar is always visually up to date.
|
||||
@@ -643,7 +646,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -647,7 +650,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
mEphemeralTabCoordinatorSupplier);
|
||||
// clang-format off
|
||||
LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
|
||||
@@ -1474,7 +1474,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
|
||||
mActionModeController.getActionModeCallback(),
|
||||
new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
|
||||
@@ -877,11 +880,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -881,11 +884,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
// the height won't be measured by the background image.
|
||||
if (mControlContainer.getBackground() == null) {
|
||||
setControlContainerTopMargin(getToolbarExtraYOffset());
|
||||
@@ -1488,7 +1488,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
|
||||
mLayoutChangeListener = null;
|
||||
}
|
||||
@@ -1289,13 +1294,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -1307,13 +1312,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
return ((LocationBarCoordinator) mLocationBar).getUrlBarTextWithoutAutocomplete();
|
||||
}
|
||||
|
||||
@@ -1516,7 +1516,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
|
||||
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
|
||||
mTabContentManager, mCompositorViewHolder,
|
||||
@@ -1303,8 +1320,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -1321,8 +1338,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
mLayoutStateProviderSupplier, mSnackbarManager);
|
||||
var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid,
|
||||
mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
|
||||
@@ -1528,7 +1528,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
|
||||
bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver(
|
||||
(x) -> { onBackPressStateChanged(); });
|
||||
@@ -2102,6 +2120,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -2120,6 +2138,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
private void setControlContainerTopMargin(int margin) {
|
||||
final ViewGroup.MarginLayoutParams layoutParams =
|
||||
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
|
||||
@@ -1618,7 +1618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
|
||||
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
|
||||
@@ -7385,6 +7385,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7389,6 +7389,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@ diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browse
|
||||
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
|
||||
@@ -8885,6 +8885,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8889,6 +8889,13 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kWaylandScreenCoordinatesEnabled)},
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1192,7 +1192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
import org.chromium.chrome.browser.commerce.ShoppingFeatures;
|
||||
import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;
|
||||
import org.chromium.chrome.browser.device.DeviceClassManager;
|
||||
@@ -1111,9 +1110,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -1114,9 +1113,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
* @param stopPriceTrackingMenuItem The menu item to stop price tracking.
|
||||
* @param currentTab Current tab being displayed.
|
||||
*/
|
||||
@@ -1205,7 +1205,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
|
||||
ShoppingServiceFactory.getForProfile(Profile.getLastUsedRegularProfile());
|
||||
ShoppingService.ProductInfo info = null;
|
||||
if (service != null && currentTab != null) {
|
||||
@@ -1144,7 +1143,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
@@ -1147,7 +1146,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
|
||||
} else {
|
||||
startPriceTrackingMenuItem.setVisible(true);
|
||||
stopPriceTrackingMenuItem.setVisible(false);
|
||||
@@ -1928,7 +1928,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
@@ -89,8 +89,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
|
||||
@@ -90,8 +90,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
|
||||
import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
|
||||
import org.chromium.chrome.browser.page_info.ChromePageInfo;
|
||||
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
|
||||
@@ -1937,7 +1937,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
|
||||
@@ -640,7 +638,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -644,7 +642,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
postDataType, postData, incognito, startSurfaceParentTabSupplier.get());
|
||||
};
|
||||
ChromePageInfo toolbarPageInfo = new ChromePageInfo(modalDialogManagerSupplier, null,
|
||||
@@ -1946,7 +1946,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
mEphemeralTabCoordinatorSupplier);
|
||||
// clang-format off
|
||||
LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
|
||||
@@ -2010,21 +2008,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -2028,21 +2026,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
* viewed in the tab switcher grid.
|
||||
*/
|
||||
private void maybeShowPriceDropIPH() {
|
||||
|
||||
@@ -2040,7 +2040,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
import org.chromium.chrome.browser.signin.services.SigninManager;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.tasks.ReturnToChromeUtil;
|
||||
@@ -44,29 +41,19 @@ import org.chromium.components.feature_engagement.EventConstants;
|
||||
@@ -45,29 +42,19 @@ import org.chromium.components.feature_engagement.EventConstants;
|
||||
import org.chromium.components.feature_engagement.FeatureConstants;
|
||||
import org.chromium.components.feature_engagement.Tracker;
|
||||
import org.chromium.components.signin.base.CoreAccountInfo;
|
||||
@@ -2071,7 +2071,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
// Whether the identity disc is visible.
|
||||
private boolean mIsIdentityDiscShown;
|
||||
|
||||
@@ -193,22 +180,13 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -198,22 +185,13 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
* IdentityDiscController for profile data updates.
|
||||
*/
|
||||
private void ensureProfileDataCache(boolean isIdentityDiscShown) {
|
||||
@@ -2095,7 +2095,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -216,11 +194,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -221,11 +199,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
* when sign-in state changes.
|
||||
*/
|
||||
private void resetIdentityDiscCache() {
|
||||
@@ -2107,7 +2107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
}
|
||||
|
||||
private void notifyObservers(boolean hint) {
|
||||
@@ -229,47 +202,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -234,47 +207,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2155,7 +2155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
/**
|
||||
* Call to tear down dependencies.
|
||||
*/
|
||||
@@ -280,16 +212,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -285,16 +217,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
mActivityLifecycleDispatcher = null;
|
||||
}
|
||||
|
||||
@@ -2172,7 +2172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
if (mNativeIsInitialized) {
|
||||
mProfileSupplier.removeObserver(mProfileSupplierObserver);
|
||||
}
|
||||
@@ -312,9 +234,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -320,9 +242,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
* @return account info for the current profile. Returns null for OTR profile.
|
||||
*/
|
||||
private CoreAccountInfo getSignedInAccountInfo() {
|
||||
@@ -2183,7 +2183,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -322,17 +242,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -330,17 +250,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
* mIdentityManager is updated with the profile, as set to null if profile is off-the-record.
|
||||
*/
|
||||
private void setProfile(Profile profile) {
|
||||
@@ -2201,7 +2201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
}
|
||||
|
||||
private String getContentDescription(@Nullable String email) {
|
||||
@@ -344,16 +253,8 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -352,16 +261,8 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
return mContext.getString(R.string.accessibility_toolbar_btn_signed_out_identity_disc);
|
||||
}
|
||||
|
||||
@@ -2219,7 +2219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
@@ -363,20 +264,13 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
@@ -371,20 +272,13 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
|
||||
}
|
||||
recordIdentityDiscUsed();
|
||||
|
||||
@@ -3361,7 +3361,7 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
|
||||
import org.chromium.chrome.browser.ui.signin.R;
|
||||
import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator;
|
||||
import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator.EntryPoint;
|
||||
@@ -31,7 +30,6 @@ public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
|
||||
@@ -32,7 +31,6 @@ public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
|
||||
private final Profile mProfile;
|
||||
private final WindowAndroid mWindowAndroid;
|
||||
private final BottomSheetController mController;
|
||||
@@ -3369,7 +3369,7 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
|
||||
private boolean mSetTestToast;
|
||||
private AccountPickerBottomSheetCoordinator mAccountPickerBottomSheetCoordinator;
|
||||
|
||||
@@ -40,7 +38,6 @@ public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
|
||||
@@ -41,7 +39,6 @@ public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
|
||||
mWindowAndroid = windowAndroid;
|
||||
mController = controller;
|
||||
mProfile = profile;
|
||||
@@ -3377,7 +3377,7 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
|
||||
mSetTestToast = false;
|
||||
}
|
||||
|
||||
@@ -52,30 +49,7 @@ public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
|
||||
@@ -53,30 +50,7 @@ public class SigninBottomSheetCoordinator implements AccountPickerDelegate {
|
||||
String accountEmail, Callback<GoogleServiceAuthError> onSignInErrorCallback) {
|
||||
Account account = AccountUtils.createAccountFromName(accountEmail);
|
||||
AccountInfoServiceProvider.get().getAccountInfoByEmail(accountEmail).then(accountInfo -> {
|
||||
|
||||
@@ -496,7 +496,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
@@ -86,7 +86,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
|
||||
@@ -87,7 +87,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
|
||||
import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
|
||||
import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
|
||||
import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
|
||||
@@ -504,7 +504,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
||||
import org.chromium.chrome.browser.page_info.ChromePageInfo;
|
||||
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
|
||||
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
|
||||
@@ -2068,11 +2067,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
@@ -2086,11 +2085,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
|
||||
return mLocationBar.getOmniboxStub();
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
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
|
||||
@@ -8775,6 +8775,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -8779,6 +8779,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kDesksTemplatesDescription, kOsCrOS,
|
||||
FEATURE_VALUE_TYPE(ash::features::kDesksTemplates)},
|
||||
#endif
|
||||
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
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
|
||||
@@ -2900,6 +2900,11 @@
|
||||
@@ -2905,6 +2905,11 @@
|
||||
// Added feature, for testing. expiry deep in future.
|
||||
"expiry_milestone": 116
|
||||
},
|
||||
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -4097,6 +4097,11 @@ const char kSendTabToSelfV2Description[] =
|
||||
@@ -4103,6 +4103,11 @@ const char kSendTabToSelfV2Description[] =
|
||||
"Enables new received tab "
|
||||
"UI shown next to the profile icon instead of using system notifications.";
|
||||
|
||||
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2356,6 +2356,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[];
|
||||
@@ -2359,6 +2359,9 @@ extern const char kShowScrollableMVTOnNTPAndroidDescription[];
|
||||
extern const char kSendTabToSelfV2Name[];
|
||||
extern const char kSendTabToSelfV2Description[];
|
||||
|
||||
|
||||
@@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
import org.chromium.chrome.browser.lens.LensMetrics;
|
||||
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
|
||||
import org.chromium.chrome.browser.logo.LogoBridge.Logo;
|
||||
@@ -94,6 +95,8 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -97,6 +98,8 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
private UiConfig mUiConfig;
|
||||
private CallbackController mCallbackController = new CallbackController();
|
||||
|
||||
@@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
/**
|
||||
* Whether the tiles shown in the layout have finished loading.
|
||||
* With {@link #mHasShownView}, it's one of the 2 flags used to track initialisation progress.
|
||||
@@ -196,6 +199,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -199,6 +202,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
initializeMostVisitedTilesCoordinator(profile, lifecycleDispatcher, tileGroupDelegate,
|
||||
touchEnabledDelegate, isScrollableMvtEnabled(), searchProviderIsGoogle);
|
||||
initializeSearchBoxBackground();
|
||||
@@ -233,7 +233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
initializeSearchBoxTextView();
|
||||
initializeVoiceSearchButton();
|
||||
initializeLensButton();
|
||||
@@ -499,16 +503,22 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -505,16 +509,22 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
R.dimen.ntp_header_lateral_paddings_v2);
|
||||
marginLayoutParams.leftMargin = -lateralPaddingsForNTP;
|
||||
marginLayoutParams.rightMargin = -lateralPaddingsForNTP;
|
||||
@@ -258,7 +258,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
marginLayoutParams.bottomMargin = getGridMvtBottomMargin();
|
||||
}
|
||||
}
|
||||
@@ -833,6 +843,22 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -839,6 +849,22 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
return iphCommandBuilder;
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug
|
||||
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
|
||||
@@ -4841,6 +4841,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4845,6 +4845,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
SINGLE_VALUE_TYPE_AND_VALUE(
|
||||
switches::kForceShowUpdateMenuItemCustomSummary,
|
||||
"Custom Summary")},
|
||||
@@ -331,7 +331,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -4164,6 +4164,9 @@ const char kStartSurfaceWithAccessibilityName[] =
|
||||
@@ -4170,6 +4170,9 @@ const char kStartSurfaceWithAccessibilityName[] =
|
||||
const char kStartSurfaceWithAccessibilityDescription[] =
|
||||
"Enable Start Surface with Accessibility.";
|
||||
|
||||
@@ -344,7 +344,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2377,6 +2377,9 @@ extern const char kSlimCompositorDescription[];
|
||||
@@ -2380,6 +2380,9 @@ extern const char kSlimCompositorDescription[];
|
||||
extern const char kSmartSuggestionForLargeDownloadsName[];
|
||||
extern const char kSmartSuggestionForLargeDownloadsDescription[];
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
|
||||
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
|
||||
@@ -4744,6 +4744,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4748,6 +4748,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kOfflinePagesLivePageSharingName,
|
||||
flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
|
||||
@@ -127,7 +127,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
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
|
||||
@@ -5231,6 +5231,11 @@
|
||||
@@ -5241,6 +5241,11 @@
|
||||
"owners": [ "//components/search/OWNERS" ],
|
||||
"expiry_milestone": 118
|
||||
},
|
||||
@@ -142,7 +142,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -3926,6 +3926,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] =
|
||||
@@ -3932,6 +3932,10 @@ const char kNotificationPermissionRationaleBottomSheetDescription[] =
|
||||
"flow. "
|
||||
"Only works with builds targeting Android T+.";
|
||||
|
||||
@@ -156,7 +156,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2260,6 +2260,9 @@ extern const char kNetworkServiceInProcessDescription[];
|
||||
@@ -2263,6 +2263,9 @@ extern const char kNetworkServiceInProcessDescription[];
|
||||
extern const char kNotificationPermissionRationaleName[];
|
||||
extern const char kNotificationPermissionRationaleDescription[];
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#include "components/translate/content/android/translate_message.h"
|
||||
#else // BUILDFLAG(IS_ANDROID)
|
||||
#include "chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h"
|
||||
@@ -7505,6 +7506,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7509,6 +7510,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
#endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) && BUILDFLAG(IS_ANDROID)
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -3846,6 +3846,12 @@ const char kInstantStartName[] = "Instant start";
|
||||
@@ -3852,6 +3852,12 @@ const char kInstantStartName[] = "Instant start";
|
||||
const char kInstantStartDescription[] =
|
||||
"Show start surface before native library is loaded.";
|
||||
|
||||
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2212,6 +2212,9 @@ extern const char kInstanceSwitcherDescription[];
|
||||
@@ -2215,6 +2215,9 @@ extern const char kInstanceSwitcherDescription[];
|
||||
extern const char kInstantStartName[];
|
||||
extern const char kInstantStartDescription[];
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
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
|
||||
@@ -1507,6 +1507,10 @@
|
||||
@@ -1512,6 +1512,10 @@
|
||||
"yangsharon@google.com", "alexmos@google.com", "creis@google.com" ],
|
||||
"expiry_milestone": 122
|
||||
},
|
||||
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -3972,6 +3972,10 @@ const char kReadLaterDescription[] =
|
||||
@@ -3978,6 +3978,10 @@ const char kReadLaterDescription[] =
|
||||
"Allow users to save tabs for later. Enables a new button and menu for "
|
||||
"accessing tabs saved for later.";
|
||||
|
||||
@@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -2284,6 +2284,9 @@ extern const char kQueryTilesSegmentationDescription[];
|
||||
@@ -2287,6 +2287,9 @@ extern const char kQueryTilesSegmentationDescription[];
|
||||
extern const char kQueryTilesSwapTrendingName[];
|
||||
extern const char kQueryTilesSwapTrendingDescription[];
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
|
||||
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
|
||||
{flag_descriptions::kTouchSelectionStrategyCharacter,
|
||||
@@ -4412,6 +4421,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4416,6 +4425,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(mojo::core::kMojoLinuxChannelSharedMem)},
|
||||
#endif
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
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
|
||||
@@ -4903,6 +4903,10 @@
|
||||
@@ -4913,6 +4913,10 @@
|
||||
"owners": [ "lazzzis", "aishwaryarj"],
|
||||
"expiry_milestone": 118
|
||||
},
|
||||
|
||||
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
|
||||
@@ -106,7 +106,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -109,7 +109,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
*/
|
||||
private boolean mHasShownView;
|
||||
|
||||
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
private boolean mSearchProviderIsGoogle;
|
||||
private boolean mShowingNonStandardLogo;
|
||||
|
||||
@@ -326,7 +326,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -332,7 +332,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
boolean isScrollableMvtEnabled, boolean searchProviderIsGoogle) {
|
||||
assert mMvTilesContainerLayout != null;
|
||||
|
||||
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
if (searchProviderIsGoogle && QueryTileUtils.isQueryTilesEnabledOnNTP()) {
|
||||
maxRows = QueryTileSection.getMaxRowsForMostVisitedTiles(getContext());
|
||||
}
|
||||
@@ -471,7 +471,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
@@ -477,7 +477,7 @@ public class NewTabPageLayout extends LinearLayout {
|
||||
&& mInitialized) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1200,7 +1200,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
|
||||
#include "base/check_op.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/containers/contains.h"
|
||||
@@ -2883,6 +2884,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
|
||||
@@ -2889,6 +2890,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
|
||||
!renderer_preferences_.user_agent_override.ua_metadata_override->mobile)
|
||||
#endif
|
||||
prefs.viewport_meta_enabled = false;
|
||||
|
||||
Reference in New Issue
Block a user