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

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

Issue 1136363003: Remove AppListMixer field trial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@applist-mixer-priority-finch-test
Patch Set: Remove old comment. Created 4 years, 5 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 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 #endif 1323 #endif
1324 #if defined(ENABLE_APP_LIST) 1324 #if defined(ENABLE_APP_LIST)
1325 {"enable-experimental-app-list", IDS_FLAGS_EXPERIMENTAL_APP_LIST_NAME, 1325 {"enable-experimental-app-list", IDS_FLAGS_EXPERIMENTAL_APP_LIST_NAME,
1326 IDS_FLAGS_EXPERIMENTAL_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS, 1326 IDS_FLAGS_EXPERIMENTAL_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS,
1327 ENABLE_DISABLE_VALUE_TYPE( 1327 ENABLE_DISABLE_VALUE_TYPE(
1328 app_list::switches::kEnableExperimentalAppList, 1328 app_list::switches::kEnableExperimentalAppList,
1329 app_list::switches::kDisableExperimentalAppList)}, 1329 app_list::switches::kDisableExperimentalAppList)},
1330 {"enable-centered-app-list", IDS_FLAGS_CENTERED_APP_LIST_NAME, 1330 {"enable-centered-app-list", IDS_FLAGS_CENTERED_APP_LIST_NAME,
1331 IDS_FLAGS_CENTERED_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS, 1331 IDS_FLAGS_CENTERED_APP_LIST_DESCRIPTION, kOsWin | kOsLinux | kOsCrOS,
1332 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)}, 1332 SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)},
1333 {"enable-new-app-list-mixer", IDS_FLAGS_NEW_APP_LIST_MIXER_NAME,
1334 IDS_FLAGS_NEW_APP_LIST_MIXER_DESCRIPTION,
1335 kOsWin | kOsLinux | kOsCrOS | kOsMac,
1336 ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableNewAppListMixer,
1337 app_list::switches::kDisableNewAppListMixer)},
1338 #endif 1333 #endif
1339 {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME, 1334 {"disable-threaded-scrolling", IDS_FLAGS_THREADED_SCROLLING_NAME,
1340 IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION, kOsAll, 1335 IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION, kOsAll,
1341 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)}, 1336 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)},
1342 {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME, 1337 {"enable-settings-window", IDS_FLAGS_SETTINGS_WINDOW_NAME,
1343 IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop, 1338 IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION, kOsDesktop,
1344 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow, 1339 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow,
1345 switches::kDisableSettingsWindow)}, 1340 switches::kDisableSettingsWindow)},
1346 {"inert-visual-viewport", IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME, 1341 {"inert-visual-viewport", IDS_FLAGS_INERT_VISUAL_VIEWPORT_NAME,
1347 IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION, kOsAll, 1342 IDS_FLAGS_INERT_VISUAL_VIEWPORT_DESCRIPTION, kOsAll,
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
2159 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2154 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2160 2155
2161 const FeatureEntry* GetFeatureEntries(size_t* count) { 2156 const FeatureEntry* GetFeatureEntries(size_t* count) {
2162 *count = arraysize(kFeatureEntries); 2157 *count = arraysize(kFeatureEntries);
2163 return kFeatureEntries; 2158 return kFeatureEntries;
2164 } 2159 }
2165 2160
2166 } // namespace testing 2161 } // namespace testing
2167 2162
2168 } // namespace about_flags 2163 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/app_list/search/search_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698