no changes (removed context of content setting patches)
This commit is contained in:
@@ -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"
|
||||
@@ -7873,6 +7874,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7869,6 +7870,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(ash::features::kClipboardHistoryReorder)},
|
||||
#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
|
||||
@@ -6968,6 +6968,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] =
|
||||
@@ -6962,6 +6962,11 @@ const char kUseOutOfProcessVideoDecodingDescription[] =
|
||||
"enabled in ash-chrome).";
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -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
|
||||
@@ -4004,6 +4004,9 @@ extern const char kQuickCommandsDescription[];
|
||||
@@ -4001,6 +4001,9 @@ extern const char kQuickCommandsDescription[];
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
|
||||
// defined (OS_FUCHSIA)
|
||||
|
||||
@@ -684,8 +684,8 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
|
||||
<part file="webapps_strings.grdp" />
|
||||
+ <part file="user_scripts/strings/userscripts_strings.grdp" />
|
||||
|
||||
<part file="browser_ui/strings/android/webgl.grdp" />
|
||||
<part file="browser_ui/strings/android/webrtc.grdp" />
|
||||
<if expr="not is_ios">
|
||||
<part file="history_clusters_strings.grdp" />
|
||||
diff --git a/components/user_scripts/README.md b/components/user_scripts/README.md
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
|
||||
Reference in New Issue
Block a user