add more patches
This commit is contained in:
@@ -33,9 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../init/ProcessInitializationHandler.java | 3 +
|
||||
chrome/android/java_sources.gni | 3 +
|
||||
chrome/browser/BUILD.gn | 7 +
|
||||
chrome/browser/about_flags.cc | 7 +
|
||||
chrome/browser/flag_descriptions.cc | 5 +
|
||||
chrome/browser/flag_descriptions.h | 3 +
|
||||
chrome/browser/about_flags.cc | 1 +
|
||||
chrome/browser/prefs/browser_prefs.cc | 4 +
|
||||
chrome/browser/profiles/BUILD.gn | 3 +
|
||||
...hrome_browser_main_extra_parts_profiles.cc | 7 +
|
||||
@@ -134,8 +132,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../renderer/web_ui_injection_host.cc | 40 +
|
||||
.../renderer/web_ui_injection_host.h | 27 +
|
||||
.../strings/userscripts_strings.grdp | 54 ++
|
||||
.../Experimental-user-scripts-support.inc | 13 +
|
||||
tools/gritsettings/resource_ids.spec | 6 +
|
||||
108 files changed, 9491 insertions(+), 2 deletions(-)
|
||||
107 files changed, 9490 insertions(+), 2 deletions(-)
|
||||
create mode 100644 components/user_scripts/README.md
|
||||
create mode 100755 components/user_scripts/android/BUILD.gn
|
||||
create mode 100644 components/user_scripts/android/java/res/layout/accept_script_item.xml
|
||||
@@ -221,6 +220,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
create mode 100755 components/user_scripts/renderer/web_ui_injection_host.cc
|
||||
create mode 100755 components/user_scripts/renderer/web_ui_injection_host.h
|
||||
create mode 100755 components/user_scripts/strings/userscripts_strings.grdp
|
||||
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
@@ -349,47 +349,6 @@ 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"
|
||||
@@ -8624,6 +8625,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryWebContentsPaste)},
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
+#if BUILDFLAG(IS_ANDROID)
|
||||
+ {"enable-userscripts-log", flag_descriptions::kEnableLoggingUserScriptsName,
|
||||
+ flag_descriptions::kEnableLoggingUserScriptsDescription, kOsDesktop | kOsAndroid,
|
||||
+ FEATURE_VALUE_TYPE(user_scripts::features::kEnableLoggingUserScripts)},
|
||||
+#endif
|
||||
+
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
{"enable-media-foundation-video-capture",
|
||||
flag_descriptions::kEnableMediaFoundationVideoCaptureName,
|
||||
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
|
||||
@@ -7599,6 +7599,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] =
|
||||
"enabled in ash-chrome).";
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
+const char kEnableLoggingUserScriptsName[] = "Enable logging user scripts component";
|
||||
+const char kEnableLoggingUserScriptsDescription[] =
|
||||
+ "Enables logging for troubleshooting feature. "
|
||||
+ "Enabling logs may make browsing slower.";
|
||||
+
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
||||
const char kWebShareName[] = "Web Share";
|
||||
const char kWebShareDescription[] =
|
||||
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
|
||||
@@ -4358,6 +4358,9 @@ extern const char kQuickCommandsDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// defined (OS_FUCHSIA)
|
||||
|
||||
+extern const char kEnableLoggingUserScriptsName[];
|
||||
+extern const char kEnableLoggingUserScriptsDescription[];
|
||||
+
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
|
||||
extern const char kWebShareName[];
|
||||
extern const char kWebShareDescription[];
|
||||
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
|
||||
@@ -10490,6 +10449,24 @@ new file mode 100755
|
||||
+ </message>
|
||||
+
|
||||
+</grit-part>
|
||||
diff --git a/cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc b/cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/cromite_flags/chrome/browser/about_flags_cc/Experimental-user-scripts-support.inc
|
||||
@@ -0,0 +1,13 @@
|
||||
+#if BUILDFLAG(IS_ANDROID)
|
||||
+
|
||||
+#ifdef FLAG_SECTION
|
||||
+
|
||||
+ {"enable-userscripts-log",
|
||||
+ "Enable logging user scripts component",
|
||||
+ "Enables logging for troubleshooting feature. "
|
||||
+ "Enabling logs may make browsing slower.", kOsAndroid,
|
||||
+ FEATURE_VALUE_TYPE(user_scripts::features::kEnableLoggingUserScripts)},
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+#endif
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user