Chromium Code Reviews| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1588 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1588 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1589 kOsMac | kOsWin | kOsLinux, | 1589 kOsMac | kOsWin | kOsLinux, |
| 1590 SINGLE_VALUE_TYPE(switches::kResetAppListInstallState) | 1590 SINGLE_VALUE_TYPE(switches::kResetAppListInstallState) |
| 1591 }, | 1591 }, |
| 1592 #if defined(ENABLE_APP_LIST) | 1592 #if defined(ENABLE_APP_LIST) |
| 1593 { | 1593 { |
| 1594 "enable-app-launcher-start-page", | 1594 "enable-app-launcher-start-page", |
| 1595 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_NAME, | 1595 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_NAME, |
| 1596 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_DESCRIPTION, | 1596 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_DESCRIPTION, |
| 1597 kOsWin | kOsCrOS, | 1597 kOsWin | kOsCrOS, |
| 1598 SINGLE_VALUE_TYPE(switches::kShowAppListStartPage) | 1598 SINGLE_VALUE_TYPE(app_list::switches::kShowAppListStartPage) |
|
xiyuan
2014/03/14 17:00:54
Do we want to just replace this flag with the expe
calamity
2014/05/07 06:11:52
Done.
| |
| 1599 }, | 1599 }, |
| 1600 #if defined(OS_LINUX) | 1600 #if defined(OS_LINUX) |
| 1601 { | 1601 { |
| 1602 // This is compiled out on non-Linux platforms because otherwise it would be | 1602 // This is compiled out on non-Linux platforms because otherwise it would be |
| 1603 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. | 1603 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. |
| 1604 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. | 1604 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. |
| 1605 "enable-app-list", | 1605 "enable-app-list", |
| 1606 IDS_FLAGS_ENABLE_APP_LIST_NAME, | 1606 IDS_FLAGS_ENABLE_APP_LIST_NAME, |
| 1607 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, | 1607 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, |
| 1608 kOsLinux, | 1608 kOsLinux, |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2407 } | 2407 } |
| 2408 | 2408 |
| 2409 const Experiment* GetExperiments(size_t* count) { | 2409 const Experiment* GetExperiments(size_t* count) { |
| 2410 *count = num_experiments; | 2410 *count = num_experiments; |
| 2411 return experiments; | 2411 return experiments; |
| 2412 } | 2412 } |
| 2413 | 2413 |
| 2414 } // namespace testing | 2414 } // namespace testing |
| 2415 | 2415 |
| 2416 } // namespace about_flags | 2416 } // namespace about_flags |
| OLD | NEW |