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

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

Issue 1966653002: Desktop Capture Picker New UI: Non Mac Structure Change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Rebase Change to New Create File 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 {"disable-audio-support-for-desktop-share", 1764 {"disable-audio-support-for-desktop-share",
1766 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE, 1765 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
1767 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1766 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1768 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)}, 1767 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
1769 #if defined(ENABLE_EXTENSIONS) 1768 #if defined(ENABLE_EXTENSIONS)
1770 {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE, 1769 {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE,
1771 IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1770 IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1772 ENABLE_DISABLE_VALUE_TYPE( 1771 ENABLE_DISABLE_VALUE_TYPE(
1773 extensions::switches::kEnableTabForDesktopShare, 1772 extensions::switches::kEnableTabForDesktopShare,
1774 extensions::switches::kDisableTabForDesktopShare)}, 1773 extensions::switches::kDisableTabForDesktopShare)},
1774 {"disable-desktop-capture-picker-old-ui",
1775 IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI,
1776 IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI_DESCRIPTION, kOsAll,
1777 SINGLE_VALUE_TYPE(
1778 extensions::switches::kDisableDesktopCapturePickerOldUI)},
1775 #endif 1779 #endif
1776 #if defined(OS_ANDROID) 1780 #if defined(OS_ANDROID)
1777 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, 1781 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
1778 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, 1782 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
1779 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, 1783 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)},
1780 #endif // defined(OS_ANDROID) 1784 #endif // defined(OS_ANDROID)
1781 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1785 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1782 {"enable-webrtc-h264-with-openh264-ffmpeg", 1786 {"enable-webrtc-h264-with-openh264-ffmpeg",
1783 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1787 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1784 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1788 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1833 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, 1837 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop,
1834 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 1838 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
1835 #endif 1839 #endif
1836 #if defined(OS_MACOSX) 1840 #if defined(OS_MACOSX)
1837 {"enable-fullscreen-in-tab-detaching", 1841 {"enable-fullscreen-in-tab-detaching",
1838 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME, 1842 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME,
1839 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac, 1843 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac,
1840 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)}, 1844 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)},
1841 #endif 1845 #endif
1842 #if defined(OS_ANDROID) 1846 #if defined(OS_ANDROID)
1843 {"media-style-notification", 1847 {"media-style-notification", IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1844 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1845 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid, 1848 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid,
1846 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)}, 1849 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)},
1847 {"important-sites-in-cbd", 1850 {"important-sites-in-cbd", IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
1848 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
1849 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid, 1851 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid,
1850 FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)}, 1852 FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)},
1851 #endif 1853 #endif
1852 {"enable-pointer-events", // FLAGS:RECORD_UMA 1854 {"enable-pointer-events", // FLAGS:RECORD_UMA
1853 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME, 1855 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
1854 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, 1856 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, kOsAll,
1855 kOsAll, 1857 FEATURE_VALUE_TYPE(features::kPointerEvents)},
1856 FEATURE_VALUE_TYPE(features::kPointerEvents)},
1857 // NOTE: Adding new command-line switches requires adding corresponding 1858 // NOTE: Adding new command-line switches requires adding corresponding
1858 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1859 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1859 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1860 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1860 }; 1861 };
1861 1862
1862 class FlagsStateSingleton { 1863 class FlagsStateSingleton {
1863 public: 1864 public:
1864 FlagsStateSingleton() 1865 FlagsStateSingleton()
1865 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1866 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1866 ~FlagsStateSingleton() {} 1867 ~FlagsStateSingleton() {}
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2046 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2047 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2047 2048
2048 const FeatureEntry* GetFeatureEntries(size_t* count) { 2049 const FeatureEntry* GetFeatureEntries(size_t* count) {
2049 *count = arraysize(kFeatureEntries); 2050 *count = arraysize(kFeatureEntries);
2050 return kFeatureEntries; 2051 return kFeatureEntries;
2051 } 2052 }
2052 2053
2053 } // namespace testing 2054 } // namespace testing
2054 2055
2055 } // namespace about_flags 2056 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698