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

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

Issue 2249583002: Revert "Enable ash window cycle UI by default." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « chrome/app/generated_resources.grd ('k') | ui/app_list/presenter/app_list_presenter_impl.cc » ('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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, 904 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
905 #endif 905 #endif
906 #if defined(OS_CHROMEOS) 906 #if defined(OS_CHROMEOS)
907 {"allow-touchpad-three-finger-click", 907 {"allow-touchpad-three-finger-click",
908 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, 908 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
909 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, 909 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS,
910 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, 910 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)},
911 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, 911 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME,
912 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, 912 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS,
913 SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)}, 913 SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)},
914 {"ash-enable-window-cycle-ui", IDS_FLAGS_ASH_ENABLE_WINDOW_CYCLE_UI_NAME,
915 IDS_FLAGS_ASH_ENABLE_WINDOW_CYCLE_UI_DESCRIPTION, kOsCrOS,
916 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWindowCycleUi)},
914 {"enable-easy-unlock-proximity-detection", 917 {"enable-easy-unlock-proximity-detection",
915 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, 918 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME,
916 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, 919 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS,
917 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)}, 920 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)},
918 {"enable-easy-unlock-bluetooth-low-energy-detection", 921 {"enable-easy-unlock-bluetooth-low-energy-detection",
919 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME, 922 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME,
920 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS, 923 IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION, kOsCrOS,
921 SINGLE_VALUE_TYPE( 924 SINGLE_VALUE_TYPE(
922 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)}, 925 proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)},
923 #endif 926 #endif
(...skipping 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
2245 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2248 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2246 2249
2247 const FeatureEntry* GetFeatureEntries(size_t* count) { 2250 const FeatureEntry* GetFeatureEntries(size_t* count) {
2248 *count = arraysize(kFeatureEntries); 2251 *count = arraysize(kFeatureEntries);
2249 return kFeatureEntries; 2252 return kFeatureEntries;
2250 } 2253 }
2251 2254
2252 } // namespace testing 2255 } // namespace testing
2253 2256
2254 } // namespace about_flags 2257 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/app_list/presenter/app_list_presenter_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698