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 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1588 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, | 1588 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, |
1589 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, | 1589 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, |
1590 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, | 1590 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, |
1591 switches::kDisableClearBrowsingDataCounters)}, | 1591 switches::kDisableClearBrowsingDataCounters)}, |
1592 #if defined(ENABLE_TASK_MANAGER) | 1592 #if defined(ENABLE_TASK_MANAGER) |
1593 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, | 1593 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, |
1594 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, | 1594 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, |
1595 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, | 1595 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, |
1596 #endif // defined(ENABLE_TASK_MANAGER) | 1596 #endif // defined(ENABLE_TASK_MANAGER) |
1597 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, | 1597 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
1598 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll, | 1598 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, |
| 1599 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
1599 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, | 1600 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, |
1600 {"experimental-keyboard-lock-ui", | 1601 {"experimental-keyboard-lock-ui", |
1601 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, | 1602 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_NAME, |
1602 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, | 1603 IDS_FLAGS_EXPERIMENTAL_KEYBOARD_LOCK_UI_DESCRIPTION, kOsDesktop, |
1603 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, | 1604 FEATURE_VALUE_TYPE(features::kExperimentalKeyboardLockUI)}, |
1604 #if defined(OS_ANDROID) | 1605 #if defined(OS_ANDROID) |
1605 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, | 1606 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
1606 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, | 1607 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |
1607 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, | 1608 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, |
1608 #endif // defined(OS_ANDROID) | 1609 #endif // defined(OS_ANDROID) |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2086 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2087 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2087 | 2088 |
2088 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2089 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2089 *count = arraysize(kFeatureEntries); | 2090 *count = arraysize(kFeatureEntries); |
2090 return kFeatureEntries; | 2091 return kFeatureEntries; |
2091 } | 2092 } |
2092 | 2093 |
2093 } // namespace testing | 2094 } // namespace testing |
2094 | 2095 |
2095 } // namespace about_flags | 2096 } // namespace about_flags |
OLD | NEW |