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

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

Issue 1847063005: [Media, UI] Change MediaNotification style to MediaStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests and rebase Created 4 years, 8 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 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 #if defined(OS_ANDROID) 1799 #if defined(OS_ANDROID)
1800 {"offline-pages-ntp", IDS_FLAGS_NTP_OFFLINE_PAGES_NAME, 1800 {"offline-pages-ntp", IDS_FLAGS_NTP_OFFLINE_PAGES_NAME,
1801 IDS_FLAGS_NTP_OFFLINE_PAGES_DESCRIPTION, kOsAndroid, 1801 IDS_FLAGS_NTP_OFFLINE_PAGES_DESCRIPTION, kOsAndroid,
1802 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePagesFeature)}, 1802 FEATURE_VALUE_TYPE(chrome::android::kNTPOfflinePagesFeature)},
1803 {"offlining-recent-pages", IDS_FLAGS_OFFLINING_RECENT_PAGES_NAME, 1803 {"offlining-recent-pages", IDS_FLAGS_OFFLINING_RECENT_PAGES_NAME,
1804 IDS_FLAGS_OFFLINING_RECENT_PAGES_DESCRIPTION, kOsAndroid, 1804 IDS_FLAGS_OFFLINING_RECENT_PAGES_DESCRIPTION, kOsAndroid,
1805 FEATURE_VALUE_TYPE(offline_pages::kOffliningRecentPagesFeature)}, 1805 FEATURE_VALUE_TYPE(offline_pages::kOffliningRecentPagesFeature)},
1806 #endif // defined(OS_ANDROID) 1806 #endif // defined(OS_ANDROID)
1807 {"protect-sync-credential", IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_NAME, 1807 {"protect-sync-credential", IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_NAME,
1808 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_DESCRIPTION, kOsAll, 1808 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_DESCRIPTION, kOsAll,
1809
1809 FEATURE_VALUE_TYPE(password_manager::features::kProtectSyncCredential)}, 1810 FEATURE_VALUE_TYPE(password_manager::features::kProtectSyncCredential)},
1810 {"protect-sync-credential-on-reauth", 1811 {"protect-sync-credential-on-reauth",
1811 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_NAME, 1812 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_NAME,
1812 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_DESCRIPTION, kOsAll, 1813 IDS_FLAGS_PROTECT_SYNC_CREDENTIAL_ON_REAUTH_DESCRIPTION, kOsAll,
1813 FEATURE_VALUE_TYPE( 1814 FEATURE_VALUE_TYPE(
1814 password_manager::features::kProtectSyncCredentialOnReauth)}, 1815 password_manager::features::kProtectSyncCredentialOnReauth)},
1815 #if defined(OS_CHROMEOS) 1816 #if defined(OS_CHROMEOS)
1816 {"enable-experimental-accessibility-features", 1817 {"enable-experimental-accessibility-features",
1817 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME, 1818 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_NAME,
1818 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS, 1819 IDS_FLAGS_EXPERIMENTAL_ACCESSIBILITY_FEATURES_DESCRIPTION, kOsCrOS,
1819 SINGLE_VALUE_TYPE( 1820 SINGLE_VALUE_TYPE(
1820 chromeos::switches::kEnableExperimentalAccessibilityFeatures)}, 1821 chromeos::switches::kEnableExperimentalAccessibilityFeatures)},
1821 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME, 1822 {"opt-in-ime-menu", IDS_FLAGS_ENABLE_IME_MENU_NAME,
1822 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS, 1823 IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION, kOsCrOS,
1823 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, 1824 FEATURE_VALUE_TYPE(features::kOptInImeMenu)},
1824 {"enable-system-timezone-automatic-detection", 1825 {"enable-system-timezone-automatic-detection",
1825 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_NAME, 1826 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_NAME,
1826 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_DESCRIPTION, kOsCrOS, 1827 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_DESCRIPTION, kOsCrOS,
1827 SINGLE_VALUE_TYPE( 1828 SINGLE_VALUE_TYPE(
1828 chromeos::switches::kEnableSystemTimezoneAutomaticDetectionPolicy)}, 1829 chromeos::switches::kEnableSystemTimezoneAutomaticDetectionPolicy)},
1829 #endif 1830 #endif
1830 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) 1831 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD)
1831 {"enable-google-branded-context-menu", 1832 {"enable-google-branded-context-menu",
1832 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, 1833 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME,
1833 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, 1834 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop,
1834 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 1835 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
1835 #endif 1836 #endif
1837 #if defined(OS_ANDROID)
1838 {"use-new-media-notification",
mlamouri (slow - plz ping) 2016/04/07 19:47:34 mediastyle-notifications
Zhiqiang Zhang (Slow) 2016/04/11 09:26:28 Done.
1839 IDS_FLAGS_USE_NEW_MEDIA_NOTIFICATION_NAME,
1840 IDS_FLAGS_USE_NEW_MEDIA_NOTIFICATION_DESCRIPTION, kOsAndroid,
1841 FEATURE_VALUE_TYPE(chrome::android::kUseNewMediaNotification)},
1842 #endif
1836 // NOTE: Adding new command-line switches requires adding corresponding 1843 // NOTE: Adding new command-line switches requires adding corresponding
1837 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1844 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1838 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1845 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1839 }; 1846 };
1840 1847
1841 class FlagsStateSingleton { 1848 class FlagsStateSingleton {
1842 public: 1849 public:
1843 FlagsStateSingleton() 1850 FlagsStateSingleton()
1844 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1851 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1845 ~FlagsStateSingleton() {} 1852 ~FlagsStateSingleton() {}
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2032 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2026 2033
2027 const FeatureEntry* GetFeatureEntries(size_t* count) { 2034 const FeatureEntry* GetFeatureEntries(size_t* count) {
2028 *count = arraysize(kFeatureEntries); 2035 *count = arraysize(kFeatureEntries);
2029 return kFeatureEntries; 2036 return kFeatureEntries;
2030 } 2037 }
2031 2038
2032 } // namespace testing 2039 } // namespace testing
2033 2040
2034 } // namespace about_flags 2041 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698