OLD | NEW |
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 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1431 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. | 1431 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. |
1432 "enable-app-list", | 1432 "enable-app-list", |
1433 IDS_FLAGS_ENABLE_APP_LIST_NAME, | 1433 IDS_FLAGS_ENABLE_APP_LIST_NAME, |
1434 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, | 1434 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, |
1435 kOsLinux, | 1435 kOsLinux, |
1436 SINGLE_VALUE_TYPE(switches::kEnableAppList) | 1436 SINGLE_VALUE_TYPE(switches::kEnableAppList) |
1437 }, | 1437 }, |
1438 #endif | 1438 #endif |
1439 #if defined(ENABLE_EXTENSIONS) | 1439 #if defined(ENABLE_EXTENSIONS) |
1440 { | 1440 { |
1441 "enable-worker-frame", | 1441 "enable-surface-worker", |
1442 IDS_FLAGS_ENABLE_WORKER_FRAME_NAME, | 1442 IDS_FLAGS_ENABLE_SURFACE_WORKER_NAME, |
1443 IDS_FLAGS_ENABLE_WORKER_FRAME_DESCRIPTION, | 1443 IDS_FLAGS_ENABLE_SURFACE_WORKER_DESCRIPTION, |
1444 kOsDesktop, | 1444 kOsDesktop, |
1445 SINGLE_VALUE_TYPE(extensions::switches::kEnableWorkerFrame) | 1445 SINGLE_VALUE_TYPE(extensions::switches::kEnableSurfaceWorker) |
1446 }, | 1446 }, |
1447 #endif | 1447 #endif |
1448 { | 1448 { |
1449 "disable-app-list-app-info", | 1449 "disable-app-list-app-info", |
1450 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, | 1450 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, |
1451 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, | 1451 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, |
1452 kOsLinux | kOsWin | kOsCrOS, | 1452 kOsLinux | kOsWin | kOsCrOS, |
1453 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) | 1453 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) |
1454 }, | 1454 }, |
1455 { | 1455 { |
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2643 } | 2643 } |
2644 | 2644 |
2645 const Experiment* GetExperiments(size_t* count) { | 2645 const Experiment* GetExperiments(size_t* count) { |
2646 *count = num_experiments; | 2646 *count = num_experiments; |
2647 return experiments; | 2647 return experiments; |
2648 } | 2648 } |
2649 | 2649 |
2650 } // namespace testing | 2650 } // namespace testing |
2651 | 2651 |
2652 } // namespace about_flags | 2652 } // namespace about_flags |
OLD | NEW |