| 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 1692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1703 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, | 1703 IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_DESCRIPTION, |
| 1704 kOsMac | kOsWin | kOsLinux, | 1704 kOsMac | kOsWin | kOsLinux, |
| 1705 SINGLE_VALUE_TYPE(switches::kResetAppListInstallState) | 1705 SINGLE_VALUE_TYPE(switches::kResetAppListInstallState) |
| 1706 }, | 1706 }, |
| 1707 #if defined(ENABLE_APP_LIST) | 1707 #if defined(ENABLE_APP_LIST) |
| 1708 { | 1708 { |
| 1709 "enable-app-launcher-start-page", | 1709 "enable-app-launcher-start-page", |
| 1710 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_NAME, | 1710 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_NAME, |
| 1711 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_DESCRIPTION, | 1711 IDS_FLAGS_ENABLE_APP_LIST_START_PAGE_DESCRIPTION, |
| 1712 kOsWin | kOsCrOS, | 1712 kOsWin | kOsCrOS, |
| 1713 SINGLE_VALUE_TYPE(switches::kShowAppListStartPage) | 1713 SINGLE_VALUE_TYPE(app_list::switches::kShowAppListStartPage) |
| 1714 }, | 1714 }, |
| 1715 #if defined(OS_LINUX) | 1715 #if defined(OS_LINUX) |
| 1716 { | 1716 { |
| 1717 // This is compiled out on non-Linux platforms because otherwise it would be | 1717 // This is compiled out on non-Linux platforms because otherwise it would be |
| 1718 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. | 1718 // visible on Win/Mac/CrOS but not on Linux GTK, which would be confusing. |
| 1719 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. | 1719 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. |
| 1720 "enable-app-list", | 1720 "enable-app-list", |
| 1721 IDS_FLAGS_ENABLE_APP_LIST_NAME, | 1721 IDS_FLAGS_ENABLE_APP_LIST_NAME, |
| 1722 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, | 1722 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, |
| 1723 kOsLinux, | 1723 kOsLinux, |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2510 } | 2510 } |
| 2511 | 2511 |
| 2512 const Experiment* GetExperiments(size_t* count) { | 2512 const Experiment* GetExperiments(size_t* count) { |
| 2513 *count = num_experiments; | 2513 *count = num_experiments; |
| 2514 return experiments; | 2514 return experiments; |
| 2515 } | 2515 } |
| 2516 | 2516 |
| 2517 } // namespace testing | 2517 } // namespace testing |
| 2518 | 2518 |
| 2519 } // namespace about_flags | 2519 } // namespace about_flags |
| OLD | NEW |