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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
98 #endif | 98 #endif |
99 | 99 |
100 #if defined(USE_ASH) | 100 #if defined(USE_ASH) |
101 #include "ash/ash_switches.h" | 101 #include "ash/ash_switches.h" |
102 #endif | 102 #endif |
103 | 103 |
104 #if defined(USE_OZONE) | 104 #if defined(USE_OZONE) |
105 #include "ui/ozone/public/ozone_switches.h" | 105 #include "ui/ozone/public/ozone_switches.h" |
106 #endif | 106 #endif |
107 | 107 |
108 #if defined(TOOLKIT_VIEWS) | |
109 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" | |
110 #endif | |
111 | |
112 using flags_ui::FeatureEntry; | 108 using flags_ui::FeatureEntry; |
113 using flags_ui::kOsMac; | 109 using flags_ui::kOsMac; |
114 using flags_ui::kOsWin; | 110 using flags_ui::kOsWin; |
115 using flags_ui::kOsLinux; | 111 using flags_ui::kOsLinux; |
116 using flags_ui::kOsCrOS; | 112 using flags_ui::kOsCrOS; |
117 using flags_ui::kOsAndroid; | 113 using flags_ui::kOsAndroid; |
118 using flags_ui::kOsCrOSOwnerOnly; | 114 using flags_ui::kOsCrOSOwnerOnly; |
119 | 115 |
120 namespace about_flags { | 116 namespace about_flags { |
121 | 117 |
(...skipping 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1618 {"enable-clear-browsing-data-counters", | 1614 {"enable-clear-browsing-data-counters", |
1619 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, | 1615 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, |
1620 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, | 1616 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, |
1621 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, | 1617 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, |
1622 switches::kDisableClearBrowsingDataCounters)}, | 1618 switches::kDisableClearBrowsingDataCounters)}, |
1623 #if defined(ENABLE_TASK_MANAGER) | 1619 #if defined(ENABLE_TASK_MANAGER) |
1624 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, | 1620 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, |
1625 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, | 1621 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, |
1626 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, | 1622 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, |
1627 #endif // defined(ENABLE_TASK_MANAGER) | 1623 #endif // defined(ENABLE_TASK_MANAGER) |
1628 #if defined(TOOLKIT_VIEWS) | |
1629 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, | 1624 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
jochen (gone - plz use gerrit)
2016/03/04 12:54:38
does this require an update to histograms.xml now
Matt Giuca
2016/03/04 23:00:28
No, it doesn't look like histograms.xml has anythi
| |
1630 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsDesktop, | 1625 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll, |
1631 FEATURE_VALUE_TYPE(ExclusiveAccessManager::kSimplifiedUIFeature)}, | 1626 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, |
1632 #endif // defined(TOOLKIT_VIEWS) | |
1633 #if defined(OS_ANDROID) | 1627 #if defined(OS_ANDROID) |
1634 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, | 1628 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
1635 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, | 1629 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |
1636 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, | 1630 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, |
1637 #endif // defined(OS_ANDROID) | 1631 #endif // defined(OS_ANDROID) |
1638 #if defined(OS_ANDROID) | 1632 #if defined(OS_ANDROID) |
1639 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, | 1633 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, |
1640 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, | 1634 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, |
1641 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, | 1635 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, |
1642 #endif // defined(OS_ANDROID) | 1636 #endif // defined(OS_ANDROID) |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2031 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2025 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2032 | 2026 |
2033 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2027 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2034 *count = arraysize(kFeatureEntries); | 2028 *count = arraysize(kFeatureEntries); |
2035 return kFeatureEntries; | 2029 return kFeatureEntries; |
2036 } | 2030 } |
2037 | 2031 |
2038 } // namespace testing | 2032 } // namespace testing |
2039 | 2033 |
2040 } // namespace about_flags | 2034 } // namespace about_flags |
OLD | NEW |