Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(944)

Unified Diff: chrome/browser/about_flags.cc

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 8da59047d793d0fdb92d47f4a743ce8ae88fd1b0..40036870325f72fe362af948e8a53c4d9f45e42a 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1172,8 +1172,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME,
IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAura,
MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)},
- {"overscroll-start-threshold",
- IDS_FLAGS_OVERSCROLL_START_THRESHOLD_NAME,
+ {"overscroll-start-threshold", IDS_FLAGS_OVERSCROLL_START_THRESHOLD_NAME,
IDS_FLAGS_OVERSCROLL_START_THRESHOLD_DESCRIPTION, kOsAura,
MULTI_VALUE_TYPE(kOverscrollStartThresholdChoices)},
#endif // USE_AURA
@@ -1629,7 +1628,7 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE_AND_VALUE(
switches::kSyncServiceURL,
"https://chrome-sync.sandbox.google.com/chrome-sync/alpha")},
-#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)
{"load-media-router-component-extension",
IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_NAME,
IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_DESCRIPTION, kOsDesktop,
@@ -1638,7 +1637,7 @@ const FeatureEntry kFeatureEntries[] = {
"1",
switches::kLoadMediaRouterComponentExtension,
"0")},
-#endif // ENABLE_MEDIA_ROUTER && !OS_ANDROID
+#endif // !OS_ANDROID
// Since Drive Search is not available when app list is disabled, flag guard
// enable-drive-search-in-chrome-launcher flag.
#if BUILDFLAG(ENABLE_APP_LIST)

Powered by Google App Engine
This is Rietveld 408576698