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

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

Issue 2375583004: [HBD] Add flag in about:flags for PPS on ALLOW mode. (Closed)
Patch Set: fix Created 4 years, 2 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
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 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 FEATURE_VALUE_TYPE(chrome::android::kReadItLaterInMenu)}, 897 FEATURE_VALUE_TYPE(chrome::android::kReadItLaterInMenu)},
898 {"enable-media-document-download-button", 898 {"enable-media-document-download-button",
899 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME, 899 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME,
900 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid, 900 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid,
901 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, 901 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)},
902 #endif // OS_ANDROID 902 #endif // OS_ANDROID
903 #if defined(ENABLE_PLUGINS) 903 #if defined(ENABLE_PLUGINS)
904 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, 904 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
905 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, 905 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop,
906 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, 906 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
907 {"run-all-flash-in-allow-mode", IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_NAME,
908 IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop,
909 FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)},
907 #endif // ENABLE_PLUGINS 910 #endif // ENABLE_PLUGINS
908 #if defined(OS_CHROMEOS) 911 #if defined(OS_CHROMEOS)
909 {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS, 912 {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS,
910 SINGLE_VALUE_TYPE("mash")}, 913 SINGLE_VALUE_TYPE("mash")},
911 {"allow-touchpad-three-finger-click", 914 {"allow-touchpad-three-finger-click",
912 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, 915 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
913 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS, 916 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS,
914 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)}, 917 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)},
915 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME, 918 {"ash-enable-unified-desktop", IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_NAME,
916 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS, 919 IDS_FLAGS_ASH_ENABLE_UNIFIED_DESKTOP_DESCRIPTION, kOsCrOS,
(...skipping 1387 matching lines...) Expand 10 before | Expand all | Expand 10 after
2304 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2307 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2305 2308
2306 const FeatureEntry* GetFeatureEntries(size_t* count) { 2309 const FeatureEntry* GetFeatureEntries(size_t* count) {
2307 *count = arraysize(kFeatureEntries); 2310 *count = arraysize(kFeatureEntries);
2308 return kFeatureEntries; 2311 return kFeatureEntries;
2309 } 2312 }
2310 2313
2311 } // namespace testing 2314 } // namespace testing
2312 2315
2313 } // namespace about_flags 2316 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/plugins/plugin_info_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698