Rebase to 143.0.7499.110
This commit is contained in:
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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
|
||||
@@ -8954,9 +8954,9 @@
|
||||
@@ -8969,9 +8969,9 @@
|
||||
"expiry_milestone": 150
|
||||
},
|
||||
{
|
||||
|
||||
@@ -998,7 +998,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
@@ -27,6 +27,7 @@ import org.chromium.build.annotations.Contract;
|
||||
@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;
|
||||
import org.chromium.build.annotations.NullMarked;
|
||||
import org.chromium.build.annotations.Nullable;
|
||||
import org.chromium.chrome.R;
|
||||
@@ -1006,7 +1006,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
|
||||
import org.chromium.chrome.browser.ActivityTabProvider;
|
||||
import org.chromium.chrome.browser.ai.AiAssistantService;
|
||||
import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
|
||||
@@ -242,7 +243,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -241,7 +242,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
|
||||
// When the feature is enabled, show either "New Incognito tab" in incognito mode
|
||||
// or "New tab" in normal mode. When the feature is disabled, show both.
|
||||
@@ -1986,7 +1986,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
@@ -6906,6 +6906,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
@@ -6900,6 +6900,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
<message name="IDS_QUICK_DELETE_DIALOG_COOKIES_CACHE_AND_OTHER_SITE_DATA_TEXT" desc="Text indicating that browsing data like cookies, cache, and other site data would be deleted.">
|
||||
Cookies, cache, and other site data
|
||||
</message>
|
||||
|
||||
@@ -666,7 +666,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
namespace about_flags {
|
||||
|
||||
namespace {
|
||||
@@ -5176,6 +5180,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
@@ -5183,6 +5187,10 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
};
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
@@ -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.
|
||||
@@ -5202,6 +5210,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
@@ -5209,6 +5217,9 @@ const FeatureEntry::FeatureVariation kProfilePickerTextVariations[] = {
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
|
||||
// //tools/flags/generate_unexpire_flags.py.
|
||||
@@ -1011,7 +1011,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
|
||||
@@ -1909,5 +1909,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -1913,5 +1913,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
// happen silently without prompting an updating dialog.
|
||||
BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
@@ -418,6 +418,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -412,6 +412,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);
|
||||
modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
} else if (id == R.id.close_all_incognito_tabs_menu_id) {
|
||||
boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
|
||||
|
||||
@@ -4019,6 +4027,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -4013,6 +4021,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
@@ -294,6 +294,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -288,6 +288,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
// Bookmarks
|
||||
modelList.add(buildBookmarksItem());
|
||||
|
||||
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
|
||||
// Recent Tabs
|
||||
if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());
|
||||
|
||||
@@ -474,6 +482,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -468,6 +476,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
}
|
||||
modelList.add(buildCloseAllTabsItem());
|
||||
if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());
|
||||
|
||||
@@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
@@ -366,6 +366,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -360,6 +360,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
|
||||
}
|
||||
|
||||
|
||||
@@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
@@ -6422,6 +6422,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
@@ -6416,6 +6416,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
|
||||
</message>
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
|
||||
if (FirstRunStatus.getFirstRunFlowComplete()
|
||||
&& !isEmptyUrl(mParams.getUrl())
|
||||
&& UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
|
||||
@@ -1066,6 +1069,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
@@ -1068,6 +1071,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
getProfile(),
|
||||
false);
|
||||
});
|
||||
|
||||
@@ -13448,7 +13448,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
||||
</message>
|
||||
<message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
|
||||
Application version
|
||||
@@ -5758,7 +5758,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
@@ -5752,7 +5752,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
|
||||
<!-- Storage Preference UI strings for clearing storage. -->
|
||||
<message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Chrome's Manage Space Activity.">
|
||||
|
||||
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
private boolean mPendingScroll;
|
||||
private boolean mIsInCct;
|
||||
|
||||
@@ -344,6 +346,28 @@ public class UrlBar extends AutocompleteEditText {
|
||||
@@ -353,6 +355,28 @@ public class UrlBar extends AutocompleteEditText {
|
||||
fixupTextDirection();
|
||||
|
||||
mShouldSendTypingStartedEvent = focused;
|
||||
|
||||
@@ -820,7 +820,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
|
||||
#include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
|
||||
#include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h"
|
||||
#include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h"
|
||||
@@ -1794,6 +1796,7 @@ void ReadAnythingAppController::OnConnected() {
|
||||
@@ -1798,6 +1800,7 @@ void ReadAnythingAppController::OnConnected() {
|
||||
render_frame()->GetBrowserInterfaceBroker().GetInterface(
|
||||
std::move(page_handler_factory_receiver));
|
||||
|
||||
@@ -828,7 +828,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
|
||||
// Get the dependency parser model used by phrase-based highlighting.
|
||||
if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) {
|
||||
return;
|
||||
@@ -1802,6 +1805,7 @@ void ReadAnythingAppController::OnConnected() {
|
||||
@@ -1806,6 +1809,7 @@ void ReadAnythingAppController::OnConnected() {
|
||||
page_handler_->GetDependencyParserModel(
|
||||
base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,
|
||||
weak_ptr_factory_.GetWeakPtr()));
|
||||
@@ -836,7 +836,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
|
||||
}
|
||||
|
||||
void ReadAnythingAppController::OnCopy() const {
|
||||
@@ -2042,8 +2046,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() {
|
||||
@@ -2046,8 +2050,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() {
|
||||
}
|
||||
|
||||
void ReadAnythingAppController::PreprocessTextForSpeech() {
|
||||
@@ -847,7 +847,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
|
||||
}
|
||||
|
||||
void ReadAnythingAppController::MovePositionToNextGranularity() {
|
||||
@@ -2297,14 +2303,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
|
||||
@@ -2301,14 +2307,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
|
||||
|
||||
void ReadAnythingAppController::UpdateDependencyParserModel(
|
||||
base::File model_file) {
|
||||
|
||||
@@ -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
|
||||
@@ -2211,9 +2211,9 @@
|
||||
@@ -2226,9 +2226,9 @@
|
||||
"expiry_milestone": -1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2335,7 +2335,7 @@ diff --git a/ui/webui/resources/css/BUILD.gn b/ui/webui/resources/css/BUILD.gn
|
||||
diff --git a/ui/webui/resources/images/BUILD.gn b/ui/webui/resources/images/BUILD.gn
|
||||
--- a/ui/webui/resources/images/BUILD.gn
|
||||
+++ b/ui/webui/resources/images/BUILD.gn
|
||||
@@ -60,7 +60,7 @@ generate_grd("build_grdp") {
|
||||
@@ -59,7 +59,7 @@ generate_grd("build_grdp") {
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -490,7 +490,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
|
||||
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
@@ -6326,6 +6326,19 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
@@ -6320,6 +6320,19 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
Make sure a phone app is enabled on this device
|
||||
</message>
|
||||
|
||||
|
||||
@@ -676,7 +676,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
@@ -790,7 +790,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -764,7 +764,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
// PDF.
|
||||
NativePage nativePage = currentTab.getNativePage();
|
||||
boolean isPdfPage = nativePage != null && nativePage.isPdf();
|
||||
@@ -803,7 +803,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
#if BUILDFLAG(ENABLE_PDF)
|
||||
#include "pdf/pdf_features.h"
|
||||
#endif
|
||||
@@ -13561,7 +13565,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -13570,7 +13574,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(
|
||||
enterprise_signals::features::kProfileSignalsReportingEnabled)},
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -6025,10 +6025,10 @@
|
||||
@@ -6040,10 +6040,10 @@
|
||||
"expiry_milestone": -1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1276,7 +1276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
|
||||
/** A class that manages browser control visibility and positioning. */
|
||||
@NullMarked
|
||||
public class BrowserControlsManager implements ActivityStateListener, BrowserControlsSizer {
|
||||
@@ -616,6 +618,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
|
||||
@@ -618,6 +620,14 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1291,7 +1291,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
|
||||
@Override
|
||||
public int getTopControlsMinHeight() {
|
||||
return mTopControlsMinHeight;
|
||||
@@ -717,6 +727,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
|
||||
@@ -719,6 +729,8 @@ public class BrowserControlsManager implements ActivityStateListener, BrowserCon
|
||||
|
||||
@Override
|
||||
public float getTopVisibleContentOffset() {
|
||||
|
||||
@@ -22,8 +22,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../platform/loader/fetch/memory_cache.h | 5 +-
|
||||
.../platform/loader/fetch/resource_fetcher.cc | 62 +++++++++++++++----
|
||||
.../platform/loader/fetch/resource_fetcher.h | 10 ++-
|
||||
.../platform/runtime_enabled_features.json5 | 2 +-
|
||||
9 files changed, 70 insertions(+), 27 deletions(-)
|
||||
.../platform/runtime_enabled_features.json5 | 4 +-
|
||||
9 files changed, 71 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc
|
||||
--- a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc
|
||||
@@ -261,12 +261,14 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h
|
||||
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -4902,7 +4902,7 @@
|
||||
@@ -4901,8 +4901,8 @@
|
||||
status: "test",
|
||||
},
|
||||
{
|
||||
name: "SvgPartitionSVGDocumentResourcesInMemoryCache",
|
||||
- status: "stable",
|
||||
+ status: "experimental",
|
||||
- name: "SvgPartitionSVGDocumentResourcesInMemoryCache",
|
||||
- status: "experimental",
|
||||
+ name: "SvgPartitionSVGDocumentResourcesInMemoryCache", status: "experimental",
|
||||
+
|
||||
},
|
||||
{
|
||||
name: "SvgScriptElementAsyncAttribute",
|
||||
|
||||
@@ -3154,7 +3154,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;
|
||||
@@ -174,12 +172,6 @@ public class OmniboxFeatures {
|
||||
@@ -177,12 +175,6 @@ public class OmniboxFeatures {
|
||||
"geolocation_request_min_update_interval_millis",
|
||||
(int) (9 * DateUtils.MINUTE_IN_MILLIS));
|
||||
|
||||
|
||||
@@ -146,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/M
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
|
||||
@@ -407,7 +407,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
@@ -401,7 +401,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
|
||||
}
|
||||
|
||||
// Help
|
||||
|
||||
@@ -87,7 +87,7 @@ diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.c
|
||||
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
|
||||
@@ -5034,6 +5034,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
@@ -5028,6 +5028,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
|
||||
<message name="IDS_READER_MODE_MESSAGE_BUTTON" desc="The label for the button to open the current page in reader mode.">
|
||||
View
|
||||
</message>
|
||||
|
||||
@@ -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
|
||||
@@ -2513,6 +2513,10 @@
|
||||
@@ -2528,6 +2528,10 @@
|
||||
"yangsharon@google.com", "alexmos@google.com", "creis@google.com" ],
|
||||
"expiry_milestone": 150
|
||||
},
|
||||
|
||||
@@ -101,7 +101,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
|
||||
@@ -12117,9 +12117,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -12126,9 +12126,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
|
||||
@@ -5459,10 +5459,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -5466,10 +5466,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
|
||||
flag_descriptions::kGpuRasterizationDescription, kOsAll,
|
||||
MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
|
||||
|
||||
@@ -796,7 +796,7 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restri
|
||||
namespace ash {
|
||||
class LoginEventRecorder;
|
||||
class StartupCustomizationDocument;
|
||||
@@ -657,6 +664,8 @@ class BASE_EXPORT ScopedAllowBlocking {
|
||||
@@ -658,6 +665,8 @@ class BASE_EXPORT ScopedAllowBlocking {
|
||||
friend class ::BrowserStateDirectoryBuilder;
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user