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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
742 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, | 742 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)}, |
743 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, | 743 {"disable-webrtc-hw-encoding", IDS_FLAGS_WEBRTC_HW_ENCODING_NAME, |
744 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 744 IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
745 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, | 745 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)}, |
746 {"enable-webrtc-hw-h264-encoding", IDS_FLAGS_WEBRTC_HW_H264_ENCODING_NAME, | 746 {"enable-webrtc-hw-h264-encoding", IDS_FLAGS_WEBRTC_HW_H264_ENCODING_NAME, |
747 IDS_FLAGS_WEBRTC_HW_H264_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, | 747 IDS_FLAGS_WEBRTC_HW_H264_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS, |
748 FEATURE_VALUE_TYPE(features::kWebRtcHWH264Encoding)}, | 748 FEATURE_VALUE_TYPE(features::kWebRtcHWH264Encoding)}, |
749 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, | 749 {"enable-webrtc-stun-origin", IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME, |
750 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, | 750 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, |
751 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, | 751 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, |
752 {"enable-webrtc-echo-canceller3", IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_NAME, | |
753 IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_DESCRIPTION, kOsAll, | |
754 FEATURE_VALUE_TYPE(features::kUseEchoCanceller3)}, | |
752 #endif // ENABLE_WEBRTC | 755 #endif // ENABLE_WEBRTC |
753 #if defined(OS_ANDROID) | 756 #if defined(OS_ANDROID) |
754 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, | 757 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, |
755 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, | 758 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, |
756 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, | 759 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, |
757 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME, | 760 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME, |
758 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid, | 761 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid, |
759 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, | 762 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, |
760 #endif // OS_ANDROID | 763 #endif // OS_ANDROID |
761 // Native client is compiled out when DISABLE_NACL is defined. | 764 // Native client is compiled out when DISABLE_NACL is defined. |
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1842 #if defined(OS_ANDROID) | 1845 #if defined(OS_ANDROID) |
1843 {"content-suggestions-category-ranker", | 1846 {"content-suggestions-category-ranker", |
1844 IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_RANKER_NAME, | 1847 IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_RANKER_NAME, |
1845 IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_RANKER_DESCRIPTION, kOsAndroid, | 1848 IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_RANKER_DESCRIPTION, kOsAndroid, |
1846 FEATURE_WITH_VARIATIONS_VALUE_TYPE( | 1849 FEATURE_WITH_VARIATIONS_VALUE_TYPE( |
1847 ntp_snippets::kCategoryRanker, | 1850 ntp_snippets::kCategoryRanker, |
1848 kContentSuggestionsCategoryRankerFeatureVariations, | 1851 kContentSuggestionsCategoryRankerFeatureVariations, |
1849 ntp_snippets::kStudyName)}, | 1852 ntp_snippets::kStudyName)}, |
1850 {"override-ntp-suggestions-source", IDS_FLAGS_OVERRIDE_SNIPPETS_SOURCE_NAME, | 1853 {"override-ntp-suggestions-source", IDS_FLAGS_OVERRIDE_SNIPPETS_SOURCE_NAME, |
1851 IDS_FLAGS_OVERRIDE_SNIPPETS_SOURCE_DESCRIPTION, kOsAndroid, | 1854 IDS_FLAGS_OVERRIDE_SNIPPETS_SOURCE_DESCRIPTION, kOsAndroid, |
1852 FEATURE_WITH_VARIATIONS_VALUE_TYPE( | 1855 FEATURE_WITH_VARIATIONS_VALUE_TYPE(ntp_snippets::kContentSuggestionsSource, |
hlundin-chromium
2017/02/09 10:20:45
I think you should avoid changing the formatting f
peah
2017/02/15 13:24:24
Thanks!
Done.
| |
1853 ntp_snippets::kContentSuggestionsSource, | 1856 kNTPSnippetsFeatureVariations, |
1854 kNTPSnippetsFeatureVariations, | 1857 ntp_snippets::kStudyName)}, |
1855 ntp_snippets::kStudyName)}, | |
1856 {"enable-ntp-snippets-increased-visibility", | 1858 {"enable-ntp-snippets-increased-visibility", |
1857 IDS_FLAGS_ENABLE_NTP_SNIPPETS_VISIBILITY_NAME, | 1859 IDS_FLAGS_ENABLE_NTP_SNIPPETS_VISIBILITY_NAME, |
1858 IDS_FLAGS_ENABLE_NTP_SNIPPETS_VISIBILITY_DESCRIPTION, kOsAndroid, | 1860 IDS_FLAGS_ENABLE_NTP_SNIPPETS_VISIBILITY_DESCRIPTION, kOsAndroid, |
1859 FEATURE_VALUE_TYPE(ntp_snippets::kIncreasedVisibility)}, | 1861 FEATURE_VALUE_TYPE(ntp_snippets::kIncreasedVisibility)}, |
1860 {"enable-ntp-save-to-offline", IDS_FLAGS_ENABLE_NTP_SAVE_TO_OFFLINE_NAME, | 1862 {"enable-ntp-save-to-offline", IDS_FLAGS_ENABLE_NTP_SAVE_TO_OFFLINE_NAME, |
1861 IDS_FLAGS_ENABLE_NTP_SAVE_TO_OFFLINE_DESCRIPTION, kOsAndroid, | 1863 IDS_FLAGS_ENABLE_NTP_SAVE_TO_OFFLINE_DESCRIPTION, kOsAndroid, |
1862 FEATURE_VALUE_TYPE(ntp_snippets::kSaveToOfflineFeature)}, | 1864 FEATURE_VALUE_TYPE(ntp_snippets::kSaveToOfflineFeature)}, |
1863 {"enable-ntp-offline-badge", IDS_FLAGS_ENABLE_NTP_OFFLINE_BADGE_NAME, | 1865 {"enable-ntp-offline-badge", IDS_FLAGS_ENABLE_NTP_OFFLINE_BADGE_NAME, |
1864 IDS_FLAGS_ENABLE_NTP_OFFLINE_BADGE_DESCRIPTION, kOsAndroid, | 1866 IDS_FLAGS_ENABLE_NTP_OFFLINE_BADGE_DESCRIPTION, kOsAndroid, |
1865 FEATURE_VALUE_TYPE(ntp_snippets::kOfflineBadgeFeature)}, | 1867 FEATURE_VALUE_TYPE(ntp_snippets::kOfflineBadgeFeature)}, |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2199 {"gdi-text-printing", IDS_FLAGS_GDI_TEXT_PRINTING, | 2201 {"gdi-text-printing", IDS_FLAGS_GDI_TEXT_PRINTING, |
2200 IDS_FLAGS_GDI_TEXT_PRINTING_DESCRIPTION, kOsWin, | 2202 IDS_FLAGS_GDI_TEXT_PRINTING_DESCRIPTION, kOsWin, |
2201 FEATURE_VALUE_TYPE(features::kGdiTextPrinting)}, | 2203 FEATURE_VALUE_TYPE(features::kGdiTextPrinting)}, |
2202 {"postscript-printing", IDS_FLAGS_POSTSCRIPT_PRINTING, | 2204 {"postscript-printing", IDS_FLAGS_POSTSCRIPT_PRINTING, |
2203 IDS_FLAGS_POSTSCRIPT_PRINTING_DESCRIPTION, kOsWin, | 2205 IDS_FLAGS_POSTSCRIPT_PRINTING_DESCRIPTION, kOsWin, |
2204 FEATURE_VALUE_TYPE(features::kPostScriptPrinting)}, | 2206 FEATURE_VALUE_TYPE(features::kPostScriptPrinting)}, |
2205 #endif // defined(OS_WIN) | 2207 #endif // defined(OS_WIN) |
2206 | 2208 |
2207 #if defined(OS_CHROMEOS) | 2209 #if defined(OS_CHROMEOS) |
2208 {"show-arc-files-app", IDS_FLAGS_SHOW_ARC_FILES_APP_NAME, | 2210 {"show-arc-files-app", IDS_FLAGS_SHOW_ARC_FILES_APP_NAME, |
2209 IDS_FLAGS_SHOW_ARC_FILES_APP_DESCRIPTION, kOsCrOS, | 2211 IDS_FLAGS_SHOW_ARC_FILES_APP_DESCRIPTION, kOsCrOS, |
hlundin-chromium
2017/02/09 10:20:45
Same here. Don't change format.
peah
2017/02/15 13:24:24
Thanks!
Done.
| |
2210 FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)}, | 2212 FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)}, |
2211 #endif // defined(OS_CHROMEOS) | 2213 #endif // defined(OS_CHROMEOS) |
2212 | 2214 |
2213 // NOTE: Adding new command-line switches requires adding corresponding | 2215 // NOTE: Adding new command-line switches requires adding corresponding |
2214 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2216 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2215 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2217 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2216 }; | 2218 }; |
2217 | 2219 |
2218 class FlagsStateSingleton { | 2220 class FlagsStateSingleton { |
2219 public: | 2221 public: |
2220 FlagsStateSingleton() | 2222 FlagsStateSingleton() |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2411 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2413 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2412 | 2414 |
2413 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2415 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2414 *count = arraysize(kFeatureEntries); | 2416 *count = arraysize(kFeatureEntries); |
2415 return kFeatureEntries; | 2417 return kFeatureEntries; |
2416 } | 2418 } |
2417 | 2419 |
2418 } // namespace testing | 2420 } // namespace testing |
2419 | 2421 |
2420 } // namespace about_flags | 2422 } // namespace about_flags |
OLD | NEW |