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

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

Issue 1932413002: Desktop Capture Picker New UI: Non Mac Structure Change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit 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 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_NAME, 1493 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_NAME,
1494 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_DESCRIPTION, kOsWin, 1494 IDS_FLAGS_TRY_SUPPORTED_CHANNEL_LAYOUTS_DESCRIPTION, kOsWin,
1495 SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts)}, 1495 SINGLE_VALUE_TYPE(switches::kTrySupportedChannelLayouts)},
1496 #endif 1496 #endif
1497 #if defined(ENABLE_WEBRTC) 1497 #if defined(ENABLE_WEBRTC)
1498 {"enable-webrtc-dtls12", IDS_FLAGS_WEBRTC_DTLS12_NAME, 1498 {"enable-webrtc-dtls12", IDS_FLAGS_WEBRTC_DTLS12_NAME,
1499 IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION, kOsAll, 1499 IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION, kOsAll,
1500 SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)}, 1500 SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)},
1501 #endif 1501 #endif
1502 #if defined(ENABLE_WEBRTC) 1502 #if defined(ENABLE_WEBRTC)
1503 {"enable-webrtc-ecdsa", 1503 {"enable-webrtc-ecdsa", IDS_FLAGS_WEBRTC_ECDSA_NAME,
1504 IDS_FLAGS_WEBRTC_ECDSA_NAME,
1505 IDS_FLAGS_WEBRTC_ECDSA_DESCRIPTION, kOsAll, 1504 IDS_FLAGS_WEBRTC_ECDSA_DESCRIPTION, kOsAll,
1506 FEATURE_VALUE_TYPE(features::kWebRtcEcdsaDefault)}, 1505 FEATURE_VALUE_TYPE(features::kWebRtcEcdsaDefault)},
1507 #endif 1506 #endif
1508 #if defined(OS_MACOSX) 1507 #if defined(OS_MACOSX)
1509 {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME, 1508 {"app-info-dialog", IDS_FLAGS_APP_INFO_DIALOG_NAME,
1510 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac, 1509 IDS_FLAGS_APP_INFO_DIALOG_DESCRIPTION, kOsMac,
1511 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, 1510 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac,
1512 switches::kDisableAppInfoDialogMac)}, 1511 switches::kDisableAppInfoDialogMac)},
1513 {"mac-views-native-app-windows", 1512 {"mac-views-native-app-windows",
1514 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, 1513 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME,
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1732 {"disable-audio-support-for-desktop-share", 1731 {"disable-audio-support-for-desktop-share",
1733 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE, 1732 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
1734 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1733 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1735 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)}, 1734 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
1736 #if defined(ENABLE_EXTENSIONS) 1735 #if defined(ENABLE_EXTENSIONS)
1737 {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE, 1736 {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE,
1738 IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1737 IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1739 ENABLE_DISABLE_VALUE_TYPE( 1738 ENABLE_DISABLE_VALUE_TYPE(
1740 extensions::switches::kEnableTabForDesktopShare, 1739 extensions::switches::kEnableTabForDesktopShare,
1741 extensions::switches::kDisableTabForDesktopShare)}, 1740 extensions::switches::kDisableTabForDesktopShare)},
1741 {"disable-desktop-capture-picker-old-ui",
1742 IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI,
1743 IDS_FLAG_DISABLE_DESKTOP_CAPTURE_PICKER_OLD_UI_DESCRIPTION, kOsAll,
1744 SINGLE_VALUE_TYPE(
1745 extensions::switches::kDisableDesktopCapturePickerOldUI)},
1742 #endif 1746 #endif
1743 #if defined(OS_ANDROID) 1747 #if defined(OS_ANDROID)
1744 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, 1748 {"enable-ntp-snippets", IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME,
1745 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid, 1749 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, kOsAndroid,
1746 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, 1750 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)},
1747 #endif // defined(OS_ANDROID) 1751 #endif // defined(OS_ANDROID)
1748 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) 1752 #if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
1749 {"enable-webrtc-h264-with-openh264-ffmpeg", 1753 {"enable-webrtc-h264-with-openh264-ffmpeg",
1750 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME, 1754 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
1751 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop, 1755 IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
1796 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, 1800 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop,
1797 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 1801 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
1798 #endif 1802 #endif
1799 #if defined(OS_MACOSX) 1803 #if defined(OS_MACOSX)
1800 {"enable-fullscreen-in-tab-detaching", 1804 {"enable-fullscreen-in-tab-detaching",
1801 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME, 1805 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_NAME,
1802 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac, 1806 IDS_FLAGS_TAB_DETACHING_IN_FULLSCREEN_DESCRIPTION, kOsMac,
1803 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)}, 1807 SINGLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching)},
1804 #endif 1808 #endif
1805 #if defined(OS_ANDROID) 1809 #if defined(OS_ANDROID)
1806 {"media-style-notification", 1810 {"media-style-notification", IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1807 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1808 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid, 1811 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid,
1809 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)}, 1812 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)},
1810 {"important-sites-in-cbd", 1813 {"important-sites-in-cbd", IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
1811 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_NAME,
1812 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid, 1814 IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION, kOsAndroid,
1813 FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)}, 1815 FEATURE_VALUE_TYPE(chrome::android::kImportantSitesInCBD)},
1814 #endif 1816 #endif
1815 {"enable-pointer-events", // FLAGS:RECORD_UMA 1817 {"enable-pointer-events", // FLAGS:RECORD_UMA
1816 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME, 1818 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_NAME,
1817 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, 1819 IDS_FLAGS_EXPERIMENTAL_POINTER_EVENT_DESCRIPTION, kOsAll,
1818 kOsAll, 1820 FEATURE_VALUE_TYPE(features::kPointerEvents)},
1819 FEATURE_VALUE_TYPE(features::kPointerEvents)},
1820 // NOTE: Adding new command-line switches requires adding corresponding 1821 // NOTE: Adding new command-line switches requires adding corresponding
1821 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1822 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1822 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1823 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1823 }; 1824 };
1824 1825
1825 class FlagsStateSingleton { 1826 class FlagsStateSingleton {
1826 public: 1827 public:
1827 FlagsStateSingleton() 1828 FlagsStateSingleton()
1828 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1829 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1829 ~FlagsStateSingleton() {} 1830 ~FlagsStateSingleton() {}
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2009 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2010 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2010 2011
2011 const FeatureEntry* GetFeatureEntries(size_t* count) { 2012 const FeatureEntry* GetFeatureEntries(size_t* count) {
2012 *count = arraysize(kFeatureEntries); 2013 *count = arraysize(kFeatureEntries);
2013 return kFeatureEntries; 2014 return kFeatureEntries;
2014 } 2015 }
2015 2016
2016 } // namespace testing 2017 } // namespace testing
2017 2018
2018 } // namespace about_flags 2019 } // 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