| 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 }, | 1703 }, |
| 1704 #if defined(ENABLE_APP_LIST) | 1704 #if defined(ENABLE_APP_LIST) |
| 1705 { | 1705 { |
| 1706 "enable-experimental-app-list", | 1706 "enable-experimental-app-list", |
| 1707 IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_NAME, | 1707 IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_NAME, |
| 1708 IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_DESCRIPTION, | 1708 IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_DESCRIPTION, |
| 1709 kOsWin | kOsLinux | kOsCrOS, | 1709 kOsWin | kOsLinux | kOsCrOS, |
| 1710 SINGLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList) | 1710 SINGLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppList) |
| 1711 }, | 1711 }, |
| 1712 { | 1712 { |
| 1713 "enable-experimental-app-list-position", | 1713 "center-app-list", |
| 1714 IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_POSITION_NAME, | 1714 IDS_FLAGS_CENTER_APP_LIST_NAME, |
| 1715 IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_POSITION_DESCRIPTION, | 1715 IDS_FLAGS_CENTER_APP_LIST_DESCRIPTION, |
| 1716 kOsWin | kOsLinux | kOsCrOS, | 1716 kOsWin | kOsLinux | kOsCrOS, |
| 1717 SINGLE_VALUE_TYPE(app_list::switches::kEnableExperimentalAppListPosition) | 1717 SINGLE_VALUE_TYPE(app_list::switches::kCenterAppList) |
| 1718 }, | 1718 }, |
| 1719 #endif | 1719 #endif |
| 1720 { | 1720 { |
| 1721 "touch-scrolling-mode", | 1721 "touch-scrolling-mode", |
| 1722 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, | 1722 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, |
| 1723 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, | 1723 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, |
| 1724 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 1724 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 1725 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) | 1725 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) |
| 1726 }, | 1726 }, |
| 1727 { | 1727 { |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2331 } | 2331 } |
| 2332 | 2332 |
| 2333 const Experiment* GetExperiments(size_t* count) { | 2333 const Experiment* GetExperiments(size_t* count) { |
| 2334 *count = num_experiments; | 2334 *count = num_experiments; |
| 2335 return experiments; | 2335 return experiments; |
| 2336 } | 2336 } |
| 2337 | 2337 |
| 2338 } // namespace testing | 2338 } // namespace testing |
| 2339 | 2339 |
| 2340 } // namespace about_flags | 2340 } // namespace about_flags |
| OLD | NEW |