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

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

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/browser/BUILD.gn ('k') | chrome/browser/android/tab_web_contents_delegate_android.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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "content/public/browser/user_metrics.h" 67 #include "content/public/browser/user_metrics.h"
68 #include "content/public/common/content_features.h" 68 #include "content/public/common/content_features.h"
69 #include "content/public/common/content_switches.h" 69 #include "content/public/common/content_switches.h"
70 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h" 70 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
71 #include "content/public/common/features.h" 71 #include "content/public/common/features.h"
72 #include "extensions/features/features.h" 72 #include "extensions/features/features.h"
73 #include "gin/public/gin_features.h" 73 #include "gin/public/gin_features.h"
74 #include "media/audio/audio_features.h" 74 #include "media/audio/audio_features.h"
75 #include "media/base/media_switches.h" 75 #include "media/base/media_switches.h"
76 #include "media/midi/midi_switches.h" 76 #include "media/midi/midi_switches.h"
77 #include "ppapi/features/features.h"
77 #include "printing/features/features.h" 78 #include "printing/features/features.h"
78 #include "ui/base/ui_base_switches.h" 79 #include "ui/base/ui_base_switches.h"
79 #include "ui/compositor/compositor_switches.h" 80 #include "ui/compositor/compositor_switches.h"
80 #include "ui/display/display_switches.h" 81 #include "ui/display/display_switches.h"
81 #include "ui/events/event_switches.h" 82 #include "ui/events/event_switches.h"
82 #include "ui/gfx/switches.h" 83 #include "ui/gfx/switches.h"
83 #include "ui/gl/gl_features.h" 84 #include "ui/gl/gl_features.h"
84 #include "ui/gl/gl_switches.h" 85 #include "ui/gl/gl_switches.h"
85 #include "ui/keyboard/keyboard_switches.h" 86 #include "ui/keyboard/keyboard_switches.h"
86 #include "ui/native_theme/native_theme_switches.h" 87 #include "ui/native_theme/native_theme_switches.h"
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 {IDS_FLAGS_WEBRTC_HW_ENCODING_NONE, switches::kDisableWebRtcHWEncoding, 626 {IDS_FLAGS_WEBRTC_HW_ENCODING_NONE, switches::kDisableWebRtcHWEncoding,
626 switches::kDisableWebRtcHWEncodingNone}, 627 switches::kDisableWebRtcHWEncodingNone},
627 }; 628 };
628 #endif // ENABLE_WEBRTC 629 #endif // ENABLE_WEBRTC
629 630
630 #if !defined(OS_ANDROID) 631 #if !defined(OS_ANDROID)
631 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = { 632 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = {
632 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DISABLED, "", ""}, 633 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DISABLED, "", ""},
633 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED, 634 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED,
634 switches::kEnableDefaultMediaSession, ""}, 635 switches::kEnableDefaultMediaSession, ""},
635 #if defined(ENABLE_PLUGINS) 636 #if BUILDFLAG(ENABLE_PLUGINS)
636 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED_DUCK_FLASH, 637 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED_DUCK_FLASH,
637 switches::kEnableDefaultMediaSession, 638 switches::kEnableDefaultMediaSession,
638 switches::kEnableDefaultMediaSessionDuckFlash}, 639 switches::kEnableDefaultMediaSessionDuckFlash},
639 #endif // defined(ENABLE_PLUGINS) 640 #endif // BUILDFLAG(ENABLE_PLUGINS)
640 }; 641 };
641 #endif // !defined(OS_ANDROID) 642 #endif // !defined(OS_ANDROID)
642 643
643 // RECORDING USER METRICS FOR FLAGS: 644 // RECORDING USER METRICS FOR FLAGS:
644 // ----------------------------------------------------------------------------- 645 // -----------------------------------------------------------------------------
645 // The first line of the entry is the internal name. 646 // The first line of the entry is the internal name.
646 // 647 //
647 // To add a new entry, add to the end of kFeatureEntries. There are two 648 // To add a new entry, add to the end of kFeatureEntries. There are two
648 // distinct types of entries: 649 // distinct types of entries:
649 // . SINGLE_VALUE: entry is either on or off. Use the SINGLE_VALUE_TYPE 650 // . SINGLE_VALUE: entry is either on or off. Use the SINGLE_VALUE_TYPE
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 ENABLE_DISABLE_VALUE_TYPE( 876 ENABLE_DISABLE_VALUE_TYPE(
876 chromeos::switches::kEnableNetworkPortalNotification, 877 chromeos::switches::kEnableNetworkPortalNotification,
877 chromeos::switches::kDisableNetworkPortalNotification)}, 878 chromeos::switches::kDisableNetworkPortalNotification)},
878 #endif // OS_CHROMEOS 879 #endif // OS_CHROMEOS
879 #if defined(OS_ANDROID) 880 #if defined(OS_ANDROID)
880 {"enable-media-document-download-button", 881 {"enable-media-document-download-button",
881 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME, 882 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_NAME,
882 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid, 883 IDS_FLAGS_MEDIA_DOCUMENT_DOWNLOAD_BUTTON_DESCRIPTION, kOsAndroid,
883 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, 884 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)},
884 #endif // OS_ANDROID 885 #endif // OS_ANDROID
885 #if defined(ENABLE_PLUGINS) 886 #if BUILDFLAG(ENABLE_PLUGINS)
886 {"prefer-html-over-flash", IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_NAME, 887 {"prefer-html-over-flash", IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_NAME,
887 IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_DESCRIPTION, kOsDesktop, 888 IDS_FLAGS_PREFER_HTML_OVER_PLUGINS_DESCRIPTION, kOsDesktop,
888 FEATURE_VALUE_TYPE(features::kPreferHtmlOverPlugins)}, 889 FEATURE_VALUE_TYPE(features::kPreferHtmlOverPlugins)},
889 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, 890 {"allow-nacl-socket-api", IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
890 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop, 891 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, kOsDesktop,
891 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")}, 892 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
892 {"run-all-flash-in-allow-mode", IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_NAME, 893 {"run-all-flash-in-allow-mode", IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_NAME,
893 IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop, 894 IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop,
894 FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)}, 895 FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)},
895 #endif // ENABLE_PLUGINS 896 #endif // ENABLE_PLUGINS
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
2327 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2328 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2328 2329
2329 const FeatureEntry* GetFeatureEntries(size_t* count) { 2330 const FeatureEntry* GetFeatureEntries(size_t* count) {
2330 *count = arraysize(kFeatureEntries); 2331 *count = arraysize(kFeatureEntries);
2331 return kFeatureEntries; 2332 return kFeatureEntries;
2332 } 2333 }
2333 2334
2334 } // namespace testing 2335 } // namespace testing
2335 2336
2336 } // namespace about_flags 2337 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/android/tab_web_contents_delegate_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698