Disable KaleidoscopeModule flag
This flag is turned on because originally Kaleidoscope + NTP modules
were launching at the same time. Now NTP modules is launching earlier
which means we need to turn this flag off.
BUG=1136904
(cherry picked from commit 4a9a49638274bba690c3c3b599ca2da66a4cec59)
Change-Id: Ie20a8650f9621dfa85803a397d55a0873f54496d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463330
Commit-Queue: Becca Hughes <[email protected]>
Commit-Queue: Tommy Steimel <[email protected]>
Auto-Submit: Becca Hughes <[email protected]>
Reviewed-by: Tommy Steimel <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#815692}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463738
Reviewed-by: Becca Hughes <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#207}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 495da15..72322087 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -6657,6 +6657,10 @@
FEATURE_VALUE_TYPE(switches::kDecoupleSyncFromAndroidMasterSync)},
#endif // defined(OS_ANDROID)
+ {"kaleidoscope-ntp-module", flag_descriptions::kKaleidoscopeModuleName,
+ flag_descriptions::kKaleidoscopeModuleDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(media::kKaleidoscopeModule)},
+
// NOTE: Adding a new flag requires adding a corresponding entry to enum
// "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
// Histograms" in tools/metrics/histograms/README.md (run the
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index a1d05e0f..3ef3efd 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -2939,6 +2939,11 @@
"expiry_milestone": 90
},
{
+ "name": "kaleidoscope-ntp-module",
+ "owners": [ "beccahughes", "media-dev" ],
+ "expiry_milestone": 92
+ },
+ {
"name": "lacros-support",
"owners": [ "jamescook", "erikchen", "[email protected]" ],
"expiry_milestone": 92
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 2dde7a3..9950630e 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1330,6 +1330,11 @@
"conflict with the latest JavaScript features. This flag allows disabling "
"support of those features for compatibility with such pages.";
+const char kKaleidoscopeModuleName[] = "Enforce Kaleidoscope NTP module";
+const char kKaleidoscopeModuleDescription[] =
+ "Enable the Kaleidoscope NTP module to display Kaleidoscope content on the "
+ " New Tab Page.";
+
const char kLauncherSettingsSearchName[] = "Launcher settings search";
const char kLauncherSettingsSearchDescription[] =
"Enable search results for OS settings in the launcher.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 62a696c..8bcd768 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -773,6 +773,9 @@
extern const char kJavascriptHarmonyShippingName[];
extern const char kJavascriptHarmonyShippingDescription[];
+extern const char kKaleidoscopeModuleName[];
+extern const char kKaleidoscopeModuleDescription[];
+
extern const char kLauncherSettingsSearchName[];
extern const char kLauncherSettingsSearchDescription[];
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 104d51d..3f33a1e 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -805,7 +805,7 @@
base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kKaleidoscopeModule{"KaleidoscopeModule",
- base::FEATURE_ENABLED_BY_DEFAULT};
+ base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kKaleidoscopeModuleCacheOnly{
"KaleidoscopeModuleCacheOnly", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index fedee901..7a96961 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -41405,6 +41405,7 @@
<int value="-1691668194" label="enable-new-bookmark-apps"/>
<int value="-1691602043" label="DisableOfficeEditingComponentApp:enabled"/>
<int value="-1691281364" label="enable-notification-action-icons"/>
+ <int value="-1687407363" label="KaleidoscopeModule:disabled"/>
<int value="-1687406612" label="UseSkiaRenderer:disabled"/>
<int value="-1686782572" label="ChromeHomeInactivitySheetExpansion:disabled"/>
<int value="-1684773837" label="TabEngagementReportingAndroid:disabled"/>
@@ -43738,6 +43739,7 @@
<int value="664591021" label="EnableContinueReading:enabled"/>
<int value="665409384"
label="AutofillToolkitViewsCreditCardDialogsMac:enabled"/>
+ <int value="666871156" label="KaleidoscopeModule:enabled"/>
<int value="667643314" label="LitePageServerPreviews:enabled"/>
<int value="669097106" label="NtpRealboxMatchOmniboxTheme:disabled"/>
<int value="673588373" label="OmniboxPedalSuggestions:disabled"/>
