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 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1507 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. | 1507 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. |
1508 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. | 1508 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. |
1509 "enable-app-list", | 1509 "enable-app-list", |
1510 IDS_FLAGS_ENABLE_APP_LIST_NAME, | 1510 IDS_FLAGS_ENABLE_APP_LIST_NAME, |
1511 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, | 1511 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, |
1512 kOsLinux, | 1512 kOsLinux, |
1513 SINGLE_VALUE_TYPE(switches::kEnableAppList) | 1513 SINGLE_VALUE_TYPE(switches::kEnableAppList) |
1514 }, | 1514 }, |
1515 #endif | 1515 #endif |
1516 { | 1516 { |
| 1517 "enable-app-view", |
| 1518 IDS_FLAGS_ENABLE_APP_VIEW_NAME, |
| 1519 IDS_FLAGS_ENABLE_APP_VIEW_DESCRIPTION, |
| 1520 kOsAll, |
| 1521 SINGLE_VALUE_TYPE(switches::kEnableAppView) |
| 1522 }, |
| 1523 { |
1517 "disable-app-list-app-info", | 1524 "disable-app-list-app-info", |
1518 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, | 1525 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, |
1519 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, | 1526 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, |
1520 kOsLinux | kOsWin | kOsCrOS, | 1527 kOsLinux | kOsWin | kOsCrOS, |
1521 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) | 1528 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) |
1522 }, | 1529 }, |
1523 { | 1530 { |
1524 "disable-app-list-voice-search", | 1531 "disable-app-list-voice-search", |
1525 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, | 1532 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, |
1526 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, | 1533 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, |
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2474 } | 2481 } |
2475 | 2482 |
2476 const Experiment* GetExperiments(size_t* count) { | 2483 const Experiment* GetExperiments(size_t* count) { |
2477 *count = num_experiments; | 2484 *count = num_experiments; |
2478 return experiments; | 2485 return experiments; |
2479 } | 2486 } |
2480 | 2487 |
2481 } // namespace testing | 2488 } // namespace testing |
2482 | 2489 |
2483 } // namespace about_flags | 2490 } // namespace about_flags |
OLD | NEW |