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

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

Issue 2694443002: Only show the 'Enable Mash' flag on CrOS. (Closed)
Patch Set: Removing accidental CL dependency. Created 3 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 | no next file » | 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 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 {"prefer-html-over-flash", IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_NAME, 919 {"prefer-html-over-flash", IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_NAME,
920 IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_DESCRIPTION, kOsDesktop, 920 IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_DESCRIPTION, kOsDesktop,
921 FEATURE_VALUE_TYPE(features::kPreferHtmlOverPlugins)}, 921 FEATURE_VALUE_TYPE(features::kPreferHtmlOverPlugins)},
922 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, 922 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
923 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, 923 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop,
924 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, 924 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
925 {"run-all-flash-in-allow-mode", IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_NAME, 925 {"run-all-flash-in-allow-mode", IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_NAME,
926 IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop, 926 IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop,
927 FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)}, 927 FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)},
928 #endif // ENABLE_PLUGINS 928 #endif // ENABLE_PLUGINS
929 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 929 #if defined(OS_CHROMEOS)
930 {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS, 930 {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS,
931 SINGLE_VALUE_TYPE(switches::kMash)}, 931 SINGLE_VALUE_TYPE(switches::kMash)},
932 #endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
933 #if defined(OS_CHROMEOS)
934 {"allow-touchpad-three-finger-click", 932 {"allow-touchpad-three-finger-click",
935 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, 933 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
936 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, 934 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS,
937 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, 935 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)},
938 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, 936 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME,
939 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, 937 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS,
940 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)}, 938 SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)},
941 {"enable-easy-unlock-proximity-detection", 939 {"enable-easy-unlock-proximity-detection",
942 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, 940 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME,
943 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS, 941 IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, kOsCrOS,
(...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after
2408 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2406 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2409 2407
2410 const FeatureEntry* GetFeatureEntries(size_t* count) { 2408 const FeatureEntry* GetFeatureEntries(size_t* count) {
2411 *count = arraysize(kFeatureEntries); 2409 *count = arraysize(kFeatureEntries);
2412 return kFeatureEntries; 2410 return kFeatureEntries;
2413 } 2411 }
2414 2412
2415 } // namespace testing 2413 } // namespace testing
2416 2414
2417 } // namespace about_flags 2415 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698