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

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

Issue 2517953003: Move enable_webrtc to a buildflag header. (Closed)
Patch Set: Fix 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/DEPS ('k') | chrome/browser/browser_process.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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "components/version_info/version_info.h" 66 #include "components/version_info/version_info.h"
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/media_features.h"
76 #include "media/midi/midi_switches.h" 77 #include "media/midi/midi_switches.h"
77 #include "ppapi/features/features.h" 78 #include "ppapi/features/features.h"
78 #include "printing/features/features.h" 79 #include "printing/features/features.h"
79 #include "ui/base/ui_base_switches.h" 80 #include "ui/base/ui_base_switches.h"
80 #include "ui/compositor/compositor_switches.h" 81 #include "ui/compositor/compositor_switches.h"
81 #include "ui/display/display_switches.h" 82 #include "ui/display/display_switches.h"
82 #include "ui/events/event_switches.h" 83 #include "ui/events/event_switches.h"
83 #include "ui/gfx/switches.h" 84 #include "ui/gfx/switches.h"
84 #include "ui/gl/gl_features.h" 85 #include "ui/gl/gl_features.h"
85 #include "ui/gl/gl_switches.h" 86 #include "ui/gl/gl_switches.h"
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_DEFAULT, "", ""}, 609 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_DEFAULT, "", ""},
609 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_NONE, switches::kSecurityChipAnimation, 610 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_NONE, switches::kSecurityChipAnimation,
610 switches::kSecurityChipAnimationNone}, 611 switches::kSecurityChipAnimationNone},
611 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_NONSECURE_ONLY, 612 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_NONSECURE_ONLY,
612 switches::kSecurityChipAnimation, 613 switches::kSecurityChipAnimation,
613 switches::kSecurityChipAnimationNonSecureOnly}, 614 switches::kSecurityChipAnimationNonSecureOnly},
614 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_ALL, switches::kSecurityChipAnimation, 615 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_ALL, switches::kSecurityChipAnimation,
615 switches::kSecurityChipAnimationAll}, 616 switches::kSecurityChipAnimationAll},
616 }; 617 };
617 618
618 #if defined(ENABLE_WEBRTC) 619 #if BUILDFLAG(ENABLE_WEBRTC)
619 const FeatureEntry::Choice kDisableWebRtcHWEncodingChoices[] = { 620 const FeatureEntry::Choice kDisableWebRtcHWEncodingChoices[] = {
620 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, 621 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
621 {IDS_FLAGS_WEBRTC_HW_ENCODING_ALL, switches::kDisableWebRtcHWEncoding, ""}, 622 {IDS_FLAGS_WEBRTC_HW_ENCODING_ALL, switches::kDisableWebRtcHWEncoding, ""},
622 {IDS_FLAGS_WEBRTC_HW_ENCODING_VPX, switches::kDisableWebRtcHWEncoding, 623 {IDS_FLAGS_WEBRTC_HW_ENCODING_VPX, switches::kDisableWebRtcHWEncoding,
623 switches::kDisableWebRtcHWEncodingVPx}, 624 switches::kDisableWebRtcHWEncodingVPx},
624 {IDS_FLAGS_WEBRTC_HW_ENCODING_H264, switches::kDisableWebRtcHWEncoding, 625 {IDS_FLAGS_WEBRTC_HW_ENCODING_H264, switches::kDisableWebRtcHWEncoding,
625 switches::kDisableWebRtcHWEncodingH264}, 626 switches::kDisableWebRtcHWEncodingH264},
626 {IDS_FLAGS_WEBRTC_HW_ENCODING_NONE, switches::kDisableWebRtcHWEncoding, 627 {IDS_FLAGS_WEBRTC_HW_ENCODING_NONE, switches::kDisableWebRtcHWEncoding,
627 switches::kDisableWebRtcHWEncodingNone}, 628 switches::kDisableWebRtcHWEncodingNone},
628 }; 629 };
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 IDS_FLAGS_ENABLE_2D_CANVAS_DYNAMIC_RENDERING_MODE_SWITCHING_DESCRIPTION, 685 IDS_FLAGS_ENABLE_2D_CANVAS_DYNAMIC_RENDERING_MODE_SWITCHING_DESCRIPTION,
685 kOsAll, 686 kOsAll,
686 SINGLE_VALUE_TYPE(switches::kEnableCanvas2dDynamicRenderingModeSwitching)}, 687 SINGLE_VALUE_TYPE(switches::kEnableCanvas2dDynamicRenderingModeSwitching)},
687 {"composited-layer-borders", IDS_FLAGS_COMPOSITED_LAYER_BORDERS, 688 {"composited-layer-borders", IDS_FLAGS_COMPOSITED_LAYER_BORDERS,
688 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, kOsAll, 689 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, kOsAll,
689 SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)}, 690 SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
690 {"gl-composited-texture-quad-borders", 691 {"gl-composited-texture-quad-borders",
691 IDS_FLAGS_GL_COMPOSITED_TEXTURE_QUAD_BORDERS, 692 IDS_FLAGS_GL_COMPOSITED_TEXTURE_QUAD_BORDERS,
692 IDS_FLAGS_GL_COMPOSITED_TEXTURE_QUAD_BORDERS_DESCRIPTION, kOsAll, 693 IDS_FLAGS_GL_COMPOSITED_TEXTURE_QUAD_BORDERS_DESCRIPTION, kOsAll,
693 SINGLE_VALUE_TYPE(cc::switches::kGlCompositedTextureQuadBorder)}, 694 SINGLE_VALUE_TYPE(cc::switches::kGlCompositedTextureQuadBorder)},
694 #if defined(ENABLE_WEBRTC) 695 #if BUILDFLAG(ENABLE_WEBRTC)
695 {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME, 696 {"disable-webrtc-hw-decoding", IDS_FLAGS_WEBRTC_HW_DECODING_NAME,
696 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS, 697 IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS,
697 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, 698 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
698 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, 699 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME,
699 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, 700 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
700 MULTI_VALUE_TYPE(kDisableWebRtcHWEncodingChoices)}, 701 MULTI_VALUE_TYPE(kDisableWebRtcHWEncodingChoices)},
701 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, 702 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
702 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 703 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
703 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 704 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
704 #endif // ENABLE_WEBRTC 705 #endif // ENABLE_WEBRTC
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 FEATURE_VALUE_TYPE(ntp_snippets::kBookmarkSuggestionsFeature)}, 1889 FEATURE_VALUE_TYPE(ntp_snippets::kBookmarkSuggestionsFeature)},
1889 {"enable-ntp-physical-web-page-suggestions", 1890 {"enable-ntp-physical-web-page-suggestions",
1890 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_NAME, 1891 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_NAME,
1891 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid, 1892 IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1892 FEATURE_VALUE_TYPE(ntp_snippets::kPhysicalWebPageSuggestionsFeature)}, 1893 FEATURE_VALUE_TYPE(ntp_snippets::kPhysicalWebPageSuggestionsFeature)},
1893 {"enable-ntp-foreign-sessions-suggestions", 1894 {"enable-ntp-foreign-sessions-suggestions",
1894 IDS_FLAGS_ENABLE_NTP_FOREIGN_SESSIONS_SUGGESTIONS_NAME, 1895 IDS_FLAGS_ENABLE_NTP_FOREIGN_SESSIONS_SUGGESTIONS_NAME,
1895 IDS_FLAGS_ENABLE_NTP_FOREIGN_SESSIONS_SUGGESTIONS_DESCRIPTION, kOsAndroid, 1896 IDS_FLAGS_ENABLE_NTP_FOREIGN_SESSIONS_SUGGESTIONS_DESCRIPTION, kOsAndroid,
1896 FEATURE_VALUE_TYPE(ntp_snippets::kForeignSessionsSuggestionsFeature)}, 1897 FEATURE_VALUE_TYPE(ntp_snippets::kForeignSessionsSuggestionsFeature)},
1897 #endif // OS_ANDROID 1898 #endif // OS_ANDROID
1898 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \ 1899 #if BUILDFLAG(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \
1899 !defined(MEDIA_DISABLE_FFMPEG) 1900 !defined(MEDIA_DISABLE_FFMPEG)
1900 {"enable-webrtc-h264-with-openh264-ffmpeg", 1901 {"enable-webrtc-h264-with-openh264-ffmpeg",
1901 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1902 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1902 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1903 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
1903 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, 1904 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
1904 #endif // ENABLE_WEBRTC && BUILDFLAG(RTC_USE_H264) && !MEDIA_DISABLE_FFMPEG 1905 #endif // ENABLE_WEBRTC && BUILDFLAG(RTC_USE_H264) && !MEDIA_DISABLE_FFMPEG
1905 #if defined(OS_ANDROID) 1906 #if defined(OS_ANDROID)
1906 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION, 1907 {"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION,
1907 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)}, 1908 kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)},
1908 #endif // OS_ANDROID 1909 #endif // OS_ANDROID
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
2328 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2329 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2329 2330
2330 const FeatureEntry* GetFeatureEntries(size_t* count) { 2331 const FeatureEntry* GetFeatureEntries(size_t* count) {
2331 *count = arraysize(kFeatureEntries); 2332 *count = arraysize(kFeatureEntries);
2332 return kFeatureEntries; 2333 return kFeatureEntries;
2333 } 2334 }
2334 2335
2335 } // namespace testing 2336 } // namespace testing
2336 2337
2337 } // namespace about_flags 2338 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/browser_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698