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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2342773002: Removed experimental app list flags. Experimental is now the only way. (Closed)
Patch Set: Respond to nit. Created 4 years, 3 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 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 switches::kDisableSessionCrashedBubble)}, 1377 switches::kDisableSessionCrashedBubble)},
1378 {"disable-cast-streaming-hw-encoding", 1378 {"disable-cast-streaming-hw-encoding",
1379 IDS_FLAGS_CAST_STREAMING_HW_ENCODING_NAME, 1379 IDS_FLAGS_CAST_STREAMING_HW_ENCODING_NAME,
1380 IDS_FLAGS_CAST_STREAMING_HW_ENCODING_DESCRIPTION, kOsAll, 1380 IDS_FLAGS_CAST_STREAMING_HW_ENCODING_DESCRIPTION, kOsAll,
1381 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding)}, 1381 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding)},
1382 #if defined(OS_ANDROID) 1382 #if defined(OS_ANDROID)
1383 {"prefetch-search-results", IDS_FLAGS_PREFETCH_SEARCH_RESULTS_NAME, 1383 {"prefetch-search-results", IDS_FLAGS_PREFETCH_SEARCH_RESULTS_NAME,
1384 IDS_FLAGS_PREFETCH_SEARCH_RESULTS_DESCRIPTION, kOsAndroid, 1384 IDS_FLAGS_PREFETCH_SEARCH_RESULTS_DESCRIPTION, kOsAndroid,
1385 SINGLE_VALUE_TYPE(switches::kPrefetchSearchResults)}, 1385 SINGLE_VALUE_TYPE(switches::kPrefetchSearchResults)},
1386 #endif 1386 #endif
1387 #if defined(ENABLE_APP_LIST)
1388 {"enable-experimental-app-list", IDS_FLAGS_EXPERIMENTAL_APP_LIST_NAME,
1389 IDS_FLAGS_EXPERIMENTAL_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS,
1390 ENABLE_DISABLE_VALUE_TYPE(
1391 app_list::switches::kEnableExperimentalAppList,
1392 app_list::switches::kDisableExperimentalAppList)},
1393 {"enable-centered-app-list", IDS_FLAGS_CENTERED_APP_LIST_NAME,
1394 IDS_FLAGS_CENTERED_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS,
1395 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)},
1396 #endif
1397 {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME, 1387 {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME,
1398 IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION, kOsAll, 1388 IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION, kOsAll,
1399 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)}, 1389 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)},
1400 {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME, 1390 {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME,
1401 IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop, 1391 IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop,
1402 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, 1392 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow,
1403 switches::kDisableSettingsWindow)}, 1393 switches::kDisableSettingsWindow)},
1404 {"inert-visual-viewport", IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME, 1394 {"inert-visual-viewport", IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME,
1405 IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION, kOsAll, 1395 IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION, kOsAll,
1406 SINGLE_VALUE_TYPE(switches::kInertVisualViewport)}, 1396 SINGLE_VALUE_TYPE(switches::kInertVisualViewport)},
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
2260 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2250 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2261 2251
2262 const FeatureEntry* GetFeatureEntries(size_t* count) { 2252 const FeatureEntry* GetFeatureEntries(size_t* count) {
2263 *count = arraysize(kFeatureEntries); 2253 *count = arraysize(kFeatureEntries);
2264 return kFeatureEntries; 2254 return kFeatureEntries;
2265 } 2255 }
2266 2256
2267 } // namespace testing 2257 } // namespace testing
2268 2258
2269 } // namespace about_flags 2259 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/apps/custom_launcher_page_browsertest_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698