fixgit apply
This commit is contained in:
parent
16dd19835d
commit
926f0a5b42
1 changed files with 3 additions and 3 deletions
|
@ -1328,7 +1328,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai
|
|||
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
|
||||
@@ -6590,6 +6590,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6587,6 +6587,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kImpulseScrollAnimationsDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kImpulseScrollAnimations)},
|
||||
|
||||
|
@ -1550,7 +1550,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
|
|||
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
||||
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
||||
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
||||
@@ -407,6 +407,8 @@ public abstract class ChromeFeatureList {
|
||||
@@ -408,6 +408,8 @@ public abstract class ChromeFeatureList {
|
||||
public static final String MOBILE_IDENTITY_CONSISTENCY_PROMOS =
|
||||
"MobileIdentityConsistencyPromos";
|
||||
public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView";
|
||||
|
@ -1802,7 +1802,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
|
||||
@@ -1384,6 +1384,12 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -1386,6 +1386,12 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
<message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
|
||||
Force Tablet Mode
|
||||
</message>
|
||||
|
|
Loading…
Add table
Reference in a new issue