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

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 for findbugs 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 1796 matching lines...) Expand 10 before | Expand all | Expand 10 after
1807 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_DESCRIPTION, kOsCrOS, 1807 IDS_FLAGS_ENABLE_SYSTEM_TIMEZONE_AUTOMATIC_DETECTION_DESCRIPTION, kOsCrOS,
1808 SINGLE_VALUE_TYPE( 1808 SINGLE_VALUE_TYPE(
1809 chromeos::switches::kEnableSystemTimezoneAutomaticDetectionPolicy)}, 1809 chromeos::switches::kEnableSystemTimezoneAutomaticDetectionPolicy)},
1810 #endif 1810 #endif
1811 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) 1811 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD)
1812 {"enable-google-branded-context-menu", 1812 {"enable-google-branded-context-menu",
1813 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME, 1813 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_NAME,
1814 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop, 1814 IDS_FLAGS_GOOGLE_BRANDED_CONTEXT_MENU_DESCRIPTION, kOsDesktop,
1815 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 1815 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
1816 #endif 1816 #endif
1817 #if defined(OS_ANDROID)
1818 {"media-style-notification",
1819 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_NAME,
1820 IDS_FLAGS_MEDIA_STYLE_NOTIFICATION_DESCRIPTION, kOsAndroid,
1821 FEATURE_VALUE_TYPE(chrome::android::kMediaStyleNotification)},
1822 #endif
1817 // NOTE: Adding new command-line switches requires adding corresponding 1823 // NOTE: Adding new command-line switches requires adding corresponding
1818 // entries to enum "LoginCustomFlags" in histograms.xml. See note in 1824 // entries to enum "LoginCustomFlags" in histograms.xml. See note in
1819 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. 1825 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
1820 }; 1826 };
1821 1827
1822 class FlagsStateSingleton { 1828 class FlagsStateSingleton {
1823 public: 1829 public:
1824 FlagsStateSingleton() 1830 FlagsStateSingleton()
1825 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 1831 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
1826 ~FlagsStateSingleton() {} 1832 ~FlagsStateSingleton() {}
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2006 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2012 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2007 2013
2008 const FeatureEntry* GetFeatureEntries(size_t* count) { 2014 const FeatureEntry* GetFeatureEntries(size_t* count) {
2009 *count = arraysize(kFeatureEntries); 2015 *count = arraysize(kFeatureEntries);
2010 return kFeatureEntries; 2016 return kFeatureEntries;
2011 } 2017 }
2012 2018
2013 } // namespace testing 2019 } // namespace testing
2014 2020
2015 } // namespace about_flags 2021 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698