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

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

Issue 1962073002: Desktop Capture Picker New UI: Non Mac Structure Change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Unittest Crash Created 4 years, 7 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 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_NAME, 1521 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_NAME,
1522 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_DESCRIPTION, kOsWin, 1522 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_DESCRIPTION, kOsWin,
1523 SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts)}, 1523 SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts)},
1524 #endif 1524 #endif
1525 #if defined(ENABLE_WEBRTC) 1525 #if defined(ENABLE_WEBRTC)
1526 {"enable-webrtc-dtls12", IDS_FLAGS_WEBRTC_DTLS12_NAME, 1526 {"enable-webrtc-dtls12", IDS_FLAGS_WEBRTC_DTLS12_NAME,
1527 IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION, kOsAll, 1527 IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION, kOsAll,
1528 SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)}, 1528 SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)},
1529 #endif 1529 #endif
1530 #if defined(ENABLE_WEBRTC) 1530 #if defined(ENABLE_WEBRTC)
1531 {"enable-webrtc-ecdsa", 1531 {"enable-webrtc-ecdsa", IDS_FLAGS_WEBRTC_ECDSA_NAME,
1532 IDS_FLAGS_WEBRTC_ECDSA_NAME,
1533 IDS_FLAGS_WEBRTC_ECDSA_DESCRIPTION, kOsAll, 1532 IDS_FLAGS_WEBRTC_ECDSA_DESCRIPTION, kOsAll,
1534 FEATURE_VALUE_TYPE(features::kWebRtcEcdsaDefault)}, 1533 FEATURE_VALUE_TYPE(features::kWebRtcEcdsaDefault)},
1535 #endif 1534 #endif
1536 #if defined(OS_MACOSX) 1535 #if defined(OS_MACOSX)
1537 {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME, 1536 {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME,
1538 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac, 1537 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac,
1539 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, 1538 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac,
1540 switches::kDisableAppInfoDialogMac)}, 1539 switches::kDisableAppInfoDialogMac)},
1541 {"mac-views-native-app-windows", 1540 {"mac-views-native-app-windows",
1542 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, 1541 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME,
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1760 {"disable-audio-support-for-desktop-share", 1759 {"disable-audio-support-for-desktop-share",
1761 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE, 1760 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
1762 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1761 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1763 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)}, 1762 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
1764 #if defined(ENABLE_EXTENSIONS) 1763 #if defined(ENABLE_EXTENSIONS)
1765 {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE, 1764 {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE,
1766 IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1765 IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1767 ENABLE_DISABLE_VALUE_TYPE( 1766 ENABLE_DISABLE_VALUE_TYPE(
1768 extensions::switches::kEnableTabForDesktopShare, 1767 extensions::switches::kEnableTabForDesktopShare,
1769 extensions::switches::kDisableTabForDesktopShare)}, 1768 extensions::switches::kDisableTabForDesktopShare)},
1769 {"disable-desktop-capture-picker-old-ui",
1770 IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI,
1771 IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI_DESCRIPTION, kOsAll,
1772 SINGLE_VALUE_TYPE(
1773 extensions::switches::kDisableDesktopCapturePickerOldUI)},
1770 #endif 1774 #endif
1771 #if defined(OS_ANDROID) 1775 #if defined(OS_ANDROID)
1772 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, 1776 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
1773 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, 1777 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
1774 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, 1778 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)},
1775 #endif // defined(OS_ANDROID) 1779 #endif // defined(OS_ANDROID)
1776 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1780 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1777 {"enable-webrtc-h264-with-openh264-ffmpeg", 1781 {"enable-webrtc-h264-with-openh264-ffmpeg",
1778 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1782 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1779 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1783 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1828 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, 1832 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop,
1829 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 1833 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
1830 #endif 1834 #endif
1831 #if defined(OS_MACOSX) 1835 #if defined(OS_MACOSX)
1832 {"enable-fullscreen-in-tab-detaching", 1836 {"enable-fullscreen-in-tab-detaching",
1833 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME, 1837 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME,
1834 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac, 1838 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac,
1835 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)}, 1839 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)},
1836 #endif 1840 #endif
1837 #if defined(OS_ANDROID) 1841 #if defined(OS_ANDROID)
1838 {"media-style-notification", 1842 {"media-style-notification", IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1839 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1840 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid, 1843 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid,
1841 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)}, 1844 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)},
1842 {"important-sites-in-cbd", 1845 {"important-sites-in-cbd", IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
1843 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
1844 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid, 1846 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid,
1845 FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)}, 1847 FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)},
1846 #endif 1848 #endif
1847 {"enable-pointer-events", // FLAGS:RECORD_UMA 1849 {"enable-pointer-events", // FLAGS:RECORD_UMA
1848 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME, 1850 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
1849 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, 1851 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, kOsAll,
1850 kOsAll, 1852 FEATURE_VALUE_TYPE(features::kPointerEvents)},
1851 FEATURE_VALUE_TYPE(features::kPointerEvents)},
1852 // NOTE: Adding new command-line switches requires adding corresponding 1853 // NOTE: Adding new command-line switches requires adding corresponding
1853 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1854 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1854 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1855 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1855 }; 1856 };
1856 1857
1857 class FlagsStateSingleton { 1858 class FlagsStateSingleton {
1858 public: 1859 public:
1859 FlagsStateSingleton() 1860 FlagsStateSingleton()
1860 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1861 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1861 ~FlagsStateSingleton() {} 1862 ~FlagsStateSingleton() {}
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2041 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2042 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2042 2043
2043 const FeatureEntry* GetFeatureEntries(size_t* count) { 2044 const FeatureEntry* GetFeatureEntries(size_t* count) {
2044 *count = arraysize(kFeatureEntries); 2045 *count = arraysize(kFeatureEntries);
2045 return kFeatureEntries; 2046 return kFeatureEntries;
2046 } 2047 }
2047 2048
2048 } // namespace testing 2049 } // namespace testing
2049 2050
2050 } // namespace about_flags 2051 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698