update patch for v88
This commit is contained in:
Carmelo Messina
parent
2812a0f9a7
commit
e7dab6556d
1 changed files with 48 additions and 56 deletions
|
|
@ -80,8 +80,8 @@ Subject: Experimental user scripts support preview
|
|||
.../user_scripts_renderer_resources.grd | 14 +
|
||||
.../user_scripts/renderer/script_context.cc | 213 +++++
|
||||
.../user_scripts/renderer/script_context.h | 70 ++
|
||||
.../user_scripts/renderer/script_injection.cc | 344 ++++++++
|
||||
.../user_scripts/renderer/script_injection.h | 160 ++++
|
||||
.../user_scripts/renderer/script_injection.cc | 342 ++++++++
|
||||
.../user_scripts/renderer/script_injection.h | 156 ++++
|
||||
.../renderer/script_injection_callback.cc | 26 +
|
||||
.../renderer/script_injection_callback.h | 38 +
|
||||
.../renderer/script_injection_manager.cc | 417 +++++++++
|
||||
|
|
@ -103,8 +103,8 @@ Subject: Experimental user scripts support preview
|
|||
.../renderer/web_ui_injection_host.h | 28 +
|
||||
.../strings/userscripts_strings.grdp | 50 ++
|
||||
tools/gritsettings/resource_ids.spec | 3 +
|
||||
.../chromium/ui/base/SelectFileDialog.java | 3 +-
|
||||
101 files changed, 8901 insertions(+), 4 deletions(-)
|
||||
.../chromium/ui/base/SelectFileDialog.java | 1 -
|
||||
101 files changed, 8893 insertions(+), 4 deletions(-)
|
||||
create mode 100755 components/user_scripts/android/BUILD.gn
|
||||
create mode 100755 components/user_scripts/android/java/res/drawable-hdpi/userscript_off.png
|
||||
create mode 100755 components/user_scripts/android/java/res/drawable-hdpi/userscript_on.png
|
||||
|
|
@ -191,16 +191,16 @@ Subject: Experimental user scripts support preview
|
|||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -226,6 +226,7 @@ android_resources("chrome_app_java_resources") {
|
||||
"//components/strings:components_locale_settings_grd",
|
||||
@@ -223,6 +223,7 @@ android_resources("chrome_app_java_resources") {
|
||||
"//components/strings:components_strings_grd",
|
||||
"//components/subresource_filter/android:java_resources",
|
||||
"//components/translate/content/android:java_resources",
|
||||
+ "//components/user_scripts/android:java_resources",
|
||||
"//content/public/android:content_java_resources",
|
||||
"//third_party/android_data_chart:android_data_chart_java_resources",
|
||||
"//third_party/android_deps:android_support_v7_appcompat_java",
|
||||
@@ -443,6 +444,7 @@ android_library("chrome_java") {
|
||||
"//components/translate/content/android:translate_android_enums_java",
|
||||
@@ -445,6 +446,7 @@ android_library("chrome_java") {
|
||||
"//components/translate/core/common:translate_infobar_event_enum_java",
|
||||
"//components/url_formatter/android:url_formatter_java",
|
||||
"//components/user_prefs/android:java",
|
||||
+ "//components/user_scripts/android:java",
|
||||
|
|
@ -233,7 +233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
|
||||
@@ -143,6 +143,8 @@ public class MainSettings extends PreferenceFragmentCompat
|
||||
@@ -120,6 +120,8 @@ public class MainSettings extends PreferenceFragmentCompat
|
||||
findPreference(PREF_PRIVACY).setTitle(R.string.prefs_privacy_security);
|
||||
}
|
||||
|
||||
|
|
@ -242,7 +242,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
|
|||
cachePreferences();
|
||||
|
||||
updatePasswordsPreference();
|
||||
@@ -303,4 +305,9 @@ public class MainSettings extends PreferenceFragmentCompat
|
||||
@@ -275,4 +277,9 @@ public class MainSettings extends PreferenceFragmentCompat
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
|
||||
@@ -256,9 +256,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
|
||||
@@ -260,9 +260,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
|
||||
finish();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.menu_id_general_help) {
|
||||
|
|
@ -283,8 +283,8 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
|
|||
|
||||
chrome_java_sources += public_autofill_assistant_java_sources
|
||||
|
||||
@@ -49,3 +50,5 @@ if (enable_arcore) {
|
||||
"java/src/org/chromium/chrome/browser/vr/ArImmersiveOverlay.java",
|
||||
@@ -48,3 +49,5 @@ if (enable_arcore) {
|
||||
"java/src/org/chromium/chrome/browser/vr/ArDelegateImpl.java",
|
||||
]
|
||||
}
|
||||
+
|
||||
|
|
@ -292,9 +292,9 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
|
|||
diff --git a/chrome/android/proguard/main.flags b/chrome/android/proguard/main.flags
|
||||
--- a/chrome/android/proguard/main.flags
|
||||
+++ b/chrome/android/proguard/main.flags
|
||||
@@ -57,3 +57,10 @@
|
||||
public <clinit>();
|
||||
*** build() return null;
|
||||
@@ -63,3 +63,10 @@
|
||||
-keep,allowobfuscation public class ** extends org.chromium.chrome.browser.base.SplitCompat*$Impl {
|
||||
public <init>();
|
||||
}
|
||||
+
|
||||
+# Keep fields name for all R.xml
|
||||
|
|
@ -306,7 +306,7 @@ diff --git a/chrome/android/proguard/main.flags b/chrome/android/proguard/main.f
|
|||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -3238,6 +3238,11 @@ static_library("browser") {
|
||||
@@ -3310,6 +3310,11 @@ static_library("browser") {
|
||||
]
|
||||
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
|
||||
}
|
||||
|
|
@ -315,13 +315,13 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
|||
+ "//components/user_scripts/browser",
|
||||
+ "//components/user_scripts/android",
|
||||
+ ]
|
||||
} else { #!is_android
|
||||
} else {
|
||||
#!is_android
|
||||
sources += [
|
||||
"accessibility/caption_controller.cc",
|
||||
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
|
||||
@@ -131,6 +131,7 @@
|
||||
@@ -135,6 +135,7 @@
|
||||
#include "components/translate/core/browser/translate_ranker_impl.h"
|
||||
#include "components/translate/core/common/translate_util.h"
|
||||
#include "components/ui_devtools/switches.h"
|
||||
|
|
@ -329,7 +329,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"
|
||||
@@ -6257,6 +6258,14 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -6176,6 +6177,14 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kUserDataSnapshot)},
|
||||
#endif
|
||||
|
||||
|
|
@ -347,7 +347,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
|
||||
@@ -4687,6 +4687,16 @@ const char kUserDataSnapshotDescription[] =
|
||||
@@ -4741,6 +4741,16 @@ const char kUserDataSnapshotDescription[] =
|
||||
"update and restoring them after a version rollback.";
|
||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
|
||||
|
|
@ -367,7 +367,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
|
||||
@@ -2735,6 +2735,11 @@ extern const char kUserDataSnapshotName[];
|
||||
@@ -2785,6 +2785,11 @@ extern const char kUserDataSnapshotName[];
|
||||
extern const char kUserDataSnapshotDescription[];
|
||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
|
||||
|
|
@ -382,15 +382,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
|||
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
||||
--- a/chrome/browser/prefs/browser_prefs.cc
|
||||
+++ b/chrome/browser/prefs/browser_prefs.cc
|
||||
@@ -228,6 +228,7 @@
|
||||
@@ -225,6 +225,7 @@
|
||||
#include "components/ntp_tiles/popular_sites_impl.h"
|
||||
#include "components/permissions/contexts/geolocation_permission_context_android.h"
|
||||
#include "components/query_tiles/tile_service_prefs.h"
|
||||
#include "components/feed/core/common/pref_names.h"
|
||||
+#include "components/user_scripts/browser/user_script_prefs.h"
|
||||
#else // defined(OS_ANDROID)
|
||||
#else // defined(OS_ANDROID)
|
||||
#include "chrome/browser/accessibility/caption_controller.h"
|
||||
#include "chrome/browser/enterprise/reporting/prefs.h"
|
||||
@@ -810,6 +811,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
@@ -851,6 +852,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||
translate::TranslatePrefs::RegisterProfilePrefs(registry);
|
||||
omnibox::RegisterProfilePrefs(registry);
|
||||
ZeroSuggestProvider::RegisterProfilePrefs(registry);
|
||||
|
|
@ -401,7 +401,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
|
|||
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -179,6 +179,8 @@
|
||||
@@ -184,6 +184,8 @@
|
||||
#include "chrome/browser/nearby_sharing/nearby_sharing_service_factory.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -410,7 +410,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
|||
namespace chrome {
|
||||
|
||||
void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
|
||||
@@ -403,6 +405,8 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -422,6 +424,8 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#endif
|
||||
WebDataServiceFactory::GetInstance();
|
||||
webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
|
||||
|
|
@ -422,7 +422,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
|||
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
|
||||
--- a/chrome/browser/profiles/profile_manager.cc
|
||||
+++ b/chrome/browser/profiles/profile_manager.cc
|
||||
@@ -109,6 +109,8 @@
|
||||
@@ -110,6 +110,8 @@
|
||||
#include "extensions/common/manifest.h"
|
||||
#endif
|
||||
|
||||
|
|
@ -431,7 +431,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
|
|||
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
|
||||
#include "chrome/browser/sessions/session_service_factory.h"
|
||||
#endif
|
||||
@@ -1287,6 +1289,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
|
||||
@@ -1320,6 +1322,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -448,14 +448,14 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
|
|||
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
|
||||
--- a/chrome/renderer/BUILD.gn
|
||||
+++ b/chrome/renderer/BUILD.gn
|
||||
@@ -154,6 +154,7 @@ static_library("renderer") {
|
||||
"//components/contextual_search/content:renderer",
|
||||
@@ -155,6 +155,7 @@ static_library("renderer") {
|
||||
"//components/data_reduction_proxy/core/common",
|
||||
"//components/data_reduction_proxy/proto:subresource_redirect_proto",
|
||||
"//components/dom_distiller/content/renderer",
|
||||
+ "//components/user_scripts/renderer",
|
||||
"//components/network_hints/renderer",
|
||||
"//components/omnibox/common",
|
||||
"//components/page_image_annotation/content/renderer",
|
||||
"//components/no_state_prefetch/common",
|
||||
"//components/no_state_prefetch/renderer",
|
||||
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
--- a/chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
|
|
@ -467,8 +467,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
|||
+#include "components/user_scripts/renderer/user_scripts_renderer_client.h"
|
||||
#else
|
||||
#include "chrome/renderer/media/chrome_speech_recognition_client.h"
|
||||
#include "chrome/renderer/searchbox/search_bouncer.h"
|
||||
@@ -363,6 +365,12 @@ void ChromeContentRendererClient::RenderThreadStarted() {
|
||||
#include "chrome/renderer/searchbox/searchbox.h"
|
||||
@@ -360,6 +362,12 @@ void ChromeContentRendererClient::RenderThreadStarted() {
|
||||
ChromeExtensionsRendererClient::GetInstance()->RenderThreadStarted();
|
||||
#endif
|
||||
|
||||
|
|
@ -481,7 +481,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
|||
#if BUILDFLAG(ENABLE_SPELLCHECK)
|
||||
if (!spellcheck_)
|
||||
InitSpellCheck();
|
||||
@@ -502,6 +510,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
|
||||
@@ -495,6 +503,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
|
||||
render_frame, registry);
|
||||
#endif
|
||||
|
||||
|
|
@ -495,7 +495,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
|||
#if BUILDFLAG(ENABLE_PLUGINS)
|
||||
new PepperHelper(render_frame);
|
||||
#endif
|
||||
@@ -1455,6 +1470,12 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
|
||||
@@ -1438,6 +1453,12 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
|
||||
render_frame);
|
||||
// |render_frame| might be dead by now.
|
||||
#endif
|
||||
|
|
@ -508,7 +508,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
|||
}
|
||||
|
||||
void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
|
||||
@@ -1464,6 +1485,12 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
|
||||
@@ -1447,6 +1468,12 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
|
||||
render_frame);
|
||||
// |render_frame| might be dead by now.
|
||||
#endif
|
||||
|
|
@ -521,7 +521,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
|||
}
|
||||
|
||||
void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
|
||||
@@ -1473,6 +1500,12 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
|
||||
@@ -1456,6 +1483,12 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
|
||||
render_frame);
|
||||
// |render_frame| might be dead by now.
|
||||
#endif
|
||||
|
|
@ -537,7 +537,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
|||
diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
|
||||
--- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
|
||||
+++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
|
||||
@@ -23,6 +23,12 @@ import androidx.preference.PreferenceFragmentCompat;
|
||||
@@ -24,6 +24,12 @@ import androidx.preference.PreferenceFragmentCompat;
|
||||
|
||||
import org.chromium.base.ApiCompatibilityUtils;
|
||||
|
||||
|
|
@ -550,7 +550,7 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
|
|||
/**
|
||||
* A helper class for Settings.
|
||||
*/
|
||||
@@ -118,4 +124,39 @@ public class SettingsUtils {
|
||||
@@ -126,4 +132,39 @@ public class SettingsUtils {
|
||||
ImageView imageButton = (ImageView) button;
|
||||
return imageButton.getDrawable() == parentMenu.getOverflowIcon();
|
||||
}
|
||||
|
|
@ -593,7 +593,7 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
|
|||
diff --git a/components/components_strings.grd b/components/components_strings.grd
|
||||
--- a/components/components_strings.grd
|
||||
+++ b/components/components_strings.grd
|
||||
@@ -319,6 +319,7 @@
|
||||
@@ -320,6 +320,7 @@
|
||||
<part file="tab_groups_strings.grdp" />
|
||||
<part file="undo_strings.grdp" />
|
||||
<part file="version_ui_strings.grdp" />
|
||||
|
|
@ -7271,7 +7271,7 @@ diff --git a/components/user_scripts/renderer/script_injection.cc b/components/u
|
|||
new file mode 100755
|
||||
--- /dev/null
|
||||
+++ b/components/user_scripts/renderer/script_injection.cc
|
||||
@@ -0,0 +1,344 @@
|
||||
@@ -0,0 +1,342 @@
|
||||
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
|
|
@ -7431,8 +7431,6 @@ new file mode 100755
|
|||
+ injection_host_(std::move(injection_host)),
|
||||
+ run_location_(run_location),
|
||||
+ request_id_(kInvalidRequestId),
|
||||
+ ukm_source_id_(base::UkmSourceId::FromInt64(
|
||||
+ render_frame_->GetWebFrame()->GetDocument().GetUkmSourceId())),
|
||||
+ complete_(false),
|
||||
+ did_inject_js_(false),
|
||||
+ log_activity_(log_activity),
|
||||
|
|
@ -7620,7 +7618,7 @@ diff --git a/components/user_scripts/renderer/script_injection.h b/components/us
|
|||
new file mode 100755
|
||||
--- /dev/null
|
||||
+++ b/components/user_scripts/renderer/script_injection.h
|
||||
@@ -0,0 +1,160 @@
|
||||
@@ -0,0 +1,156 @@
|
||||
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
|
|
@ -7636,7 +7634,6 @@ new file mode 100755
|
|||
+#include "base/callback.h"
|
||||
+#include "base/macros.h"
|
||||
+#include "base/memory/weak_ptr.h"
|
||||
+#include "base/metrics/ukm_source_id.h"
|
||||
+#include "base/optional.h"
|
||||
+#include "../common/user_script.h"
|
||||
+#include "injection_host.h"
|
||||
|
|
@ -7751,9 +7748,6 @@ new file mode 100755
|
|||
+ // currently waiting on permission.
|
||||
+ int64_t request_id_;
|
||||
+
|
||||
+ // Identifies the frame we're injecting into.
|
||||
+ base::UkmSourceId ukm_source_id_;
|
||||
+
|
||||
+ // Whether or not the injection is complete, either via injecting the script
|
||||
+ // or because it will never complete.
|
||||
+ bool complete_;
|
||||
|
|
@ -9795,7 +9789,7 @@ new file mode 100755
|
|||
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
||||
--- a/tools/gritsettings/resource_ids.spec
|
||||
+++ b/tools/gritsettings/resource_ids.spec
|
||||
@@ -426,6 +426,9 @@
|
||||
@@ -412,6 +412,9 @@
|
||||
"components/autofill/core/browser/autofill_address_rewriter_resources.grd":{
|
||||
"includes": [2880]
|
||||
},
|
||||
|
|
@ -9808,13 +9802,11 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_
|
|||
diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
|
||||
--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
|
||||
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
|
||||
@@ -749,7 +749,8 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
@@ -749,7 +749,6 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
}
|
||||
|
||||
private int countAcceptTypesFor(String superType) {
|
||||
- assert superType.indexOf('/') == -1;
|
||||
+ //assert removed from upstream
|
||||
+ //assert superType.indexOf('/') == -1;
|
||||
int count = 0;
|
||||
for (String type : mFileTypes) {
|
||||
if (type.startsWith(superType)) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue