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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( 1165 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
1166 autofill::switches::kWalletServiceUseSandbox, 1166 autofill::switches::kWalletServiceUseSandbox,
1167 "1", 1167 "1",
1168 autofill::switches::kWalletServiceUseSandbox, 1168 autofill::switches::kWalletServiceUseSandbox,
1169 "0")}, 1169 "0")},
1170 #if defined(USE_AURA) 1170 #if defined(USE_AURA)
1171 {"overscroll-history-navigation", 1171 {"overscroll-history-navigation",
1172 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, 1172 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME,
1173 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAura, 1173 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAura,
1174 MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)}, 1174 MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)},
1175 {"overscroll-start-threshold", 1175 {"overscroll-start-threshold", IDS_FLAGS_OVERSCROLL_START_THRESHOLD_NAME,
1176 IDS_FLAGS_OVERSCROLL_START_THRESHOLD_NAME,
1177 IDS_FLAGS_OVERSCROLL_START_THRESHOLD_DESCRIPTION, kOsAura, 1176 IDS_FLAGS_OVERSCROLL_START_THRESHOLD_DESCRIPTION, kOsAura,
1178 MULTI_VALUE_TYPE(kOverscrollStartThresholdChoices)}, 1177 MULTI_VALUE_TYPE(kOverscrollStartThresholdChoices)},
1179 #endif // USE_AURA 1178 #endif // USE_AURA
1180 {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME, 1179 {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME,
1181 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS, 1180 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS,
1182 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect, 1181 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect,
1183 "1", 1182 "1",
1184 switches::kScrollEndEffect, 1183 switches::kScrollEndEffect,
1185 "0")}, 1184 "0")},
1186 {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME, 1185 {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME,
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 switches::kDisableAddToShelf)}, 1621 switches::kDisableAddToShelf)},
1623 {"bypass-app-banner-engagement-checks", 1622 {"bypass-app-banner-engagement-checks",
1624 IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_NAME, 1623 IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_NAME,
1625 IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_DESCRIPTION, kOsAll, 1624 IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_DESCRIPTION, kOsAll,
1626 SINGLE_VALUE_TYPE(switches::kBypassAppBannerEngagementChecks)}, 1625 SINGLE_VALUE_TYPE(switches::kBypassAppBannerEngagementChecks)},
1627 {"use-sync-sandbox", IDS_FLAGS_SYNC_SANDBOX_NAME, 1626 {"use-sync-sandbox", IDS_FLAGS_SYNC_SANDBOX_NAME,
1628 IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, kOsAll, 1627 IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION, kOsAll,
1629 SINGLE_VALUE_TYPE_AND_VALUE( 1628 SINGLE_VALUE_TYPE_AND_VALUE(
1630 switches::kSyncServiceURL, 1629 switches::kSyncServiceURL,
1631 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")}, 1630 "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")},
1632 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID) 1631 #if !defined(OS_ANDROID)
1633 {"load-media-router-component-extension", 1632 {"load-media-router-component-extension",
1634 IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_NAME, 1633 IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_NAME,
1635 IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_DESCRIPTION, kOsDesktop, 1634 IDS_FLAGS_LOAD_MEDIA_ROUTER_COMPONENT_EXTENSION_DESCRIPTION, kOsDesktop,
1636 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( 1635 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
1637 switches::kLoadMediaRouterComponentExtension, 1636 switches::kLoadMediaRouterComponentExtension,
1638 "1", 1637 "1",
1639 switches::kLoadMediaRouterComponentExtension, 1638 switches::kLoadMediaRouterComponentExtension,
1640 "0")}, 1639 "0")},
1641 #endif // ENABLE_MEDIA_ROUTER && !OS_ANDROID 1640 #endif // !OS_ANDROID
1642 // Since Drive Search is not available when app list is disabled, flag guard 1641 // Since Drive Search is not available when app list is disabled, flag guard
1643 // enable-drive-search-in-chrome-launcher flag. 1642 // enable-drive-search-in-chrome-launcher flag.
1644 #if BUILDFLAG(ENABLE_APP_LIST) 1643 #if BUILDFLAG(ENABLE_APP_LIST)
1645 {"enable-drive-search-in-app-launcher", 1644 {"enable-drive-search-in-app-launcher",
1646 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER, 1645 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER,
1647 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION, kOsCrOS, 1646 IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION, kOsCrOS,
1648 ENABLE_DISABLE_VALUE_TYPE( 1647 ENABLE_DISABLE_VALUE_TYPE(
1649 app_list::switches::kEnableDriveSearchInChromeLauncher, 1648 app_list::switches::kEnableDriveSearchInChromeLauncher,
1650 app_list::switches::kDisableDriveSearchInChromeLauncher)}, 1649 app_list::switches::kDisableDriveSearchInChromeLauncher)},
1651 #endif // BUILDFLAG(ENABLE_APP_LIST) 1650 #endif // BUILDFLAG(ENABLE_APP_LIST)
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
2618 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2617 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2619 2618
2620 const FeatureEntry* GetFeatureEntries(size_t* count) { 2619 const FeatureEntry* GetFeatureEntries(size_t* count) {
2621 *count = arraysize(kFeatureEntries); 2620 *count = arraysize(kFeatureEntries);
2622 return kFeatureEntries; 2621 return kFeatureEntries;
2623 } 2622 }
2624 2623
2625 } // namespace testing 2624 } // namespace testing
2626 2625
2627 } // namespace about_flags 2626 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698