OLD | NEW |
---|---|
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
49 #include "components/proximity_auth/switches.h" | 49 #include "components/proximity_auth/switches.h" |
50 #include "components/search/search_switches.h" | 50 #include "components/search/search_switches.h" |
51 #include "components/security_state/switches.h" | 51 #include "components/security_state/switches.h" |
52 #include "components/signin/core/common/signin_switches.h" | 52 #include "components/signin/core/common/signin_switches.h" |
53 #include "components/sync_driver/sync_driver_switches.h" | 53 #include "components/sync_driver/sync_driver_switches.h" |
54 #include "components/tracing/tracing_switches.h" | 54 #include "components/tracing/tracing_switches.h" |
55 #include "components/version_info/version_info.h" | 55 #include "components/version_info/version_info.h" |
56 #include "content/public/browser/user_metrics.h" | 56 #include "content/public/browser/user_metrics.h" |
57 #include "content/public/common/content_features.h" | 57 #include "content/public/common/content_features.h" |
58 #include "content/public/common/content_switches.h" | 58 #include "content/public/common/content_switches.h" |
59 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h" | |
60 #include "content/public/common/features.h" | |
59 #include "grit/components_strings.h" | 61 #include "grit/components_strings.h" |
60 #include "media/base/media_switches.h" | 62 #include "media/base/media_switches.h" |
61 #include "media/midi/midi_switches.h" | 63 #include "media/midi/midi_switches.h" |
62 #include "ui/base/l10n/l10n_util.h" | 64 #include "ui/base/l10n/l10n_util.h" |
63 #include "ui/base/ui_base_switches.h" | 65 #include "ui/base/ui_base_switches.h" |
64 #include "ui/compositor/compositor_switches.h" | 66 #include "ui/compositor/compositor_switches.h" |
65 #include "ui/display/display_switches.h" | 67 #include "ui/display/display_switches.h" |
66 #include "ui/events/event_switches.h" | 68 #include "ui/events/event_switches.h" |
67 #include "ui/gfx/switches.h" | 69 #include "ui/gfx/switches.h" |
68 #include "ui/gl/gl_switches.h" | 70 #include "ui/gl/gl_switches.h" |
(...skipping 1725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1794 switches::kUIDisableCompositorAnimationTimelines)}, | 1796 switches::kUIDisableCompositorAnimationTimelines)}, |
1795 #endif // !defined(OS_ANDROID) | 1797 #endif // !defined(OS_ANDROID) |
1796 {"enable-audio-support-for-desktop-share", | 1798 {"enable-audio-support-for-desktop-share", |
1797 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE, | 1799 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE, |
1798 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, | 1800 IDS_FLAG_ENABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, |
1799 kOsAll, | 1801 kOsAll, |
1800 SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)}, | 1802 SINGLE_VALUE_TYPE(switches::kEnableAudioSupportForDesktopShare)}, |
1801 #if defined(ENABLE_EXTENSIONS) | 1803 #if defined(ENABLE_EXTENSIONS) |
1802 {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE, | 1804 {"enable-tab-for-desktop-share", IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE, |
1803 IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, | 1805 IDS_FLAG_ENABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, |
1804 SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)} | 1806 SINGLE_VALUE_TYPE(extensions::switches::kEnableTabForDesktopShare)}, |
1805 #endif | 1807 #endif |
1806 #if defined(OS_ANDROID) | 1808 #if defined(OS_ANDROID) |
1807 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, | 1809 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, |
1808 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, | 1810 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, |
1809 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, | 1811 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, |
1810 #endif // defined(OS_ANDROID) | 1812 #endif // defined(OS_ANDROID) |
1813 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) | |
jochen (gone - plz use gerrit)
2016/03/02 11:03:42
how bad is it that the generated resources if bloc
hbos_chromium
2016/03/02 12:54:56
Not sure, but the other WebRTC features which are
Alexei Svitkine (slow)
2016/03/02 17:29:46
I think if the generated resources if doesn't matc
hbos_chromium
2016/03/03 16:51:42
Done. It was doable. Matching .grd with the #if, r
| |
1814 {"enable-webrtc-h264-with-openh264-ffmpeg", | |
1815 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, | |
1816 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, | |
1817 kOsMac | kOsWin | kOsLinux | kOsCrOS, | |
1818 FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, | |
1819 #endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) | |
1811 // NOTE: Adding new command-line switches requires adding corresponding | 1820 // NOTE: Adding new command-line switches requires adding corresponding |
1812 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1821 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1813 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1822 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
1814 }; | 1823 }; |
1815 | 1824 |
1816 class FlagsStateSingleton { | 1825 class FlagsStateSingleton { |
1817 public: | 1826 public: |
1818 FlagsStateSingleton() | 1827 FlagsStateSingleton() |
1819 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 1828 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
1820 ~FlagsStateSingleton() {} | 1829 ~FlagsStateSingleton() {} |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2022 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2031 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2023 | 2032 |
2024 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2033 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2025 *count = arraysize(kFeatureEntries); | 2034 *count = arraysize(kFeatureEntries); |
2026 return kFeatureEntries; | 2035 return kFeatureEntries; |
2027 } | 2036 } |
2028 | 2037 |
2029 } // namespace testing | 2038 } // namespace testing |
2030 | 2039 |
2031 } // namespace about_flags | 2040 } // namespace about_flags |
OLD | NEW |