Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 1685043002: Convert --{enable,disable}-simplified-fullscreen-ui to a feature flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/exclusive_access/exclusive_access_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #endif 97 #endif
98 98
99 #if defined(USE_ASH) 99 #if defined(USE_ASH)
100 #include "ash/ash_switches.h" 100 #include "ash/ash_switches.h"
101 #endif 101 #endif
102 102
103 #if defined(USE_OZONE) 103 #if defined(USE_OZONE)
104 #include "ui/ozone/public/ozone_switches.h" 104 #include "ui/ozone/public/ozone_switches.h"
105 #endif 105 #endif
106 106
107 #if defined(TOOLKIT_VIEWS)
108 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
109 #endif
110
107 using flags_ui::FeatureEntry; 111 using flags_ui::FeatureEntry;
108 using flags_ui::kOsMac; 112 using flags_ui::kOsMac;
109 using flags_ui::kOsWin; 113 using flags_ui::kOsWin;
110 using flags_ui::kOsLinux; 114 using flags_ui::kOsLinux;
111 using flags_ui::kOsCrOS; 115 using flags_ui::kOsCrOS;
112 using flags_ui::kOsAndroid; 116 using flags_ui::kOsAndroid;
113 using flags_ui::kOsCrOSOwnerOnly; 117 using flags_ui::kOsCrOSOwnerOnly;
114 118
115 namespace about_flags { 119 namespace about_flags {
116 120
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1607 {"enable-clear-browsing-data-counters", 1611 {"enable-clear-browsing-data-counters",
1608 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, 1612 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME,
1609 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll, 1613 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, kOsAll,
1610 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters, 1614 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters,
1611 switches::kDisableClearBrowsingDataCounters)}, 1615 switches::kDisableClearBrowsingDataCounters)},
1612 #if defined(ENABLE_TASK_MANAGER) 1616 #if defined(ENABLE_TASK_MANAGER)
1613 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME, 1617 {"disable-new-task-manager", IDS_FLAGS_NEW_TASK_MANAGER_NAME,
1614 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop, 1618 IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION, kOsDesktop,
1615 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)}, 1619 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)},
1616 #endif // defined(ENABLE_TASK_MANAGER) 1620 #endif // defined(ENABLE_TASK_MANAGER)
1621 #if defined(TOOLKIT_VIEWS)
1617 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME, 1622 {"simplified-fullscreen-ui", IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_NAME,
1618 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsDesktop, 1623 IDS_FLAGS_SIMPLIFIED_FULLSCREEN_UI_DESCRIPTION, kOsDesktop,
1619 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSimplifiedFullscreenUI, 1624 FEATURE_VALUE_TYPE(ExclusiveAccessManager::kSimplifiedUIFeature)},
1620 switches::kDisableSimplifiedFullscreenUI)}, 1625 #endif // defined(TOOLKIT_VIEWS)
1621 #if defined(OS_ANDROID) 1626 #if defined(OS_ANDROID)
1622 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME, 1627 {"progress-bar-animation", IDS_FLAGS_PROGRESS_BAR_ANIMATION_NAME,
1623 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid, 1628 IDS_FLAGS_PROGRESS_BAR_ANIMATION_DESCRIPTION, kOsAndroid,
1624 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)}, 1629 MULTI_VALUE_TYPE(kProgressBarAnimationChoices)},
1625 #endif // defined(OS_ANDROID) 1630 #endif // defined(OS_ANDROID)
1626 #if defined(OS_ANDROID) 1631 #if defined(OS_ANDROID)
1627 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME, 1632 {"offline-pages-mode", IDS_FLAGS_OFFLINE_PAGES_NAME,
1628 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, 1633 IDS_FLAGS_OFFLINE_PAGES_DESCRIPTION, kOsAndroid,
1629 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)}, 1634 MULTI_VALUE_TYPE(kEnableOfflinePagesChoices)},
1630 #endif // defined(OS_ANDROID) 1635 #endif // defined(OS_ANDROID)
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1994 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 1999 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
1995 2000
1996 const FeatureEntry* GetFeatureEntries(size_t* count) { 2001 const FeatureEntry* GetFeatureEntries(size_t* count) {
1997 *count = arraysize(kFeatureEntries); 2002 *count = arraysize(kFeatureEntries);
1998 return kFeatureEntries; 2003 return kFeatureEntries;
1999 } 2004 }
2000 2005
2001 } // namespace testing 2006 } // namespace testing
2002 2007
2003 } // namespace about_flags 2008 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/exclusive_access/exclusive_access_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698