| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 #endif | 102 #endif |
| 103 | 103 |
| 104 #if defined(USE_ASH) | 104 #if defined(USE_ASH) |
| 105 #include "ash/ash_switches.h" | 105 #include "ash/ash_switches.h" |
| 106 #endif | 106 #endif |
| 107 | 107 |
| 108 #if defined(USE_OZONE) | 108 #if defined(USE_OZONE) |
| 109 #include "ui/ozone/public/ozone_switches.h" | 109 #include "ui/ozone/public/ozone_switches.h" |
| 110 #endif | 110 #endif |
| 111 | 111 |
| 112 #if defined(TOOLKIT_VIEWS) | |
| 113 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" | |
| 114 #endif | |
| 115 | |
| 116 using flags_ui::FeatureEntry; | 112 using flags_ui::FeatureEntry; |
| 117 using flags_ui::kOsMac; | 113 using flags_ui::kOsMac; |
| 118 using flags_ui::kOsWin; | 114 using flags_ui::kOsWin; |
| 119 using flags_ui::kOsLinux; | 115 using flags_ui::kOsLinux; |
| 120 using flags_ui::kOsCrOS; | 116 using flags_ui::kOsCrOS; |
| 121 using flags_ui::kOsAndroid; | 117 using flags_ui::kOsAndroid; |
| 122 using flags_ui::kOsCrOSOwnerOnly; | 118 using flags_ui::kOsCrOSOwnerOnly; |
| 123 | 119 |
| 124 namespace about_flags { | 120 namespace about_flags { |
| 125 | 121 |
| (...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1600 {"enable-clear-browsing-data-counters", | 1596 {"enable-clear-browsing-data-counters", |
| 1601 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, | 1597 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, |
| 1602 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, | 1598 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, |
| 1603 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, | 1599 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, |
| 1604 switches::kDisableClearBrowsingDataCounters)}, | 1600 switches::kDisableClearBrowsingDataCounters)}, |
| 1605 #if defined(ENABLE_TASK_MANAGER) | 1601 #if defined(ENABLE_TASK_MANAGER) |
| 1606 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, | 1602 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, |
| 1607 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, | 1603 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, |
| 1608 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, | 1604 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, |
| 1609 #endif // defined(ENABLE_TASK_MANAGER) | 1605 #endif // defined(ENABLE_TASK_MANAGER) |
| 1610 #if defined(TOOLKIT_VIEWS) | |
| 1611 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, | 1606 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, |
| 1612 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsDesktop, | 1607 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsAll, |
| 1613 FEATURE_VALUE_TYPE(ExclusiveAccessManager::kSimplifiedUIFeature)}, | 1608 FEATURE_VALUE_TYPE(features::kSimplifiedFullscreenUI)}, |
| 1614 #endif // defined(TOOLKIT_VIEWS) | |
| 1615 #if defined(OS_ANDROID) | 1609 #if defined(OS_ANDROID) |
| 1616 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, | 1610 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, |
| 1617 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, | 1611 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, |
| 1618 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, | 1612 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, |
| 1619 #endif // defined(OS_ANDROID) | 1613 #endif // defined(OS_ANDROID) |
| 1620 #if defined(OS_ANDROID) | 1614 #if defined(OS_ANDROID) |
| 1621 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, | 1615 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, |
| 1622 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, | 1616 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, |
| 1623 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, | 1617 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, |
| 1624 #endif // defined(OS_ANDROID) | 1618 #endif // defined(OS_ANDROID) |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2018 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2012 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2019 | 2013 |
| 2020 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2014 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2021 *count = arraysize(kFeatureEntries); | 2015 *count = arraysize(kFeatureEntries); |
| 2022 return kFeatureEntries; | 2016 return kFeatureEntries; |
| 2023 } | 2017 } |
| 2024 | 2018 |
| 2025 } // namespace testing | 2019 } // namespace testing |
| 2026 | 2020 |
| 2027 } // namespace about_flags | 2021 } // namespace about_flags |
| OLD | NEW |