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

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

Issue 2855143004: Implements a display scale tray setting behind a chrome switch (Closed)
Patch Set: Sync with ToT Created 3 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 2826 matching lines...) Expand 10 before | Expand all | Expand 10 after
2837 2837
2838 {"use-suggestions-even-if-few", 2838 {"use-suggestions-even-if-few",
2839 flag_descriptions::kUseSuggestionsEvenIfFewFeatureName, 2839 flag_descriptions::kUseSuggestionsEvenIfFewFeatureName,
2840 flag_descriptions::kUseSuggestionsEvenIfFewFeatureDescription, kOsAll, 2840 flag_descriptions::kUseSuggestionsEvenIfFewFeatureDescription, kOsAll,
2841 FEATURE_VALUE_TYPE(suggestions::kUseSuggestionsEvenIfFewFeature)}, 2841 FEATURE_VALUE_TYPE(suggestions::kUseSuggestionsEvenIfFewFeature)},
2842 2842
2843 {"enable-location-hard-reload", flag_descriptions::kLocationHardReloadName, 2843 {"enable-location-hard-reload", flag_descriptions::kLocationHardReloadName,
2844 flag_descriptions::kLocationHardReloadDescription, kOsAll, 2844 flag_descriptions::kLocationHardReloadDescription, kOsAll,
2845 FEATURE_VALUE_TYPE(features::kLocationHardReload)}, 2845 FEATURE_VALUE_TYPE(features::kLocationHardReload)},
2846 2846
2847 #if defined(USE_ASH) && defined(OS_CHROMEOS)
2848 {"ash-enable-scale-settings-tray",
2849 flag_descriptions::kAshEnableScaleSettingsTrayName,
2850 flag_descriptions::kAshEnableScaleSettingsTrayDescription, kOsCrOS,
2851 SINGLE_VALUE_TYPE(ash::switches::kAshEnableScaleSettingsTray)},
2852 #endif
oshima 2017/05/06 19:50:22 I prefer not to expose this to users. Rather we sh
2853
2847 // NOTE: Adding new command-line switches requires adding corresponding 2854 // NOTE: Adding new command-line switches requires adding corresponding
2848 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in 2855 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in
2849 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. 2856 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test.
2850 }; 2857 };
2851 2858
2852 class FlagsStateSingleton { 2859 class FlagsStateSingleton {
2853 public: 2860 public:
2854 FlagsStateSingleton() 2861 FlagsStateSingleton()
2855 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} 2862 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
2856 ~FlagsStateSingleton() {} 2863 ~FlagsStateSingleton() {}
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
3062 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3069 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3063 3070
3064 const FeatureEntry* GetFeatureEntries(size_t* count) { 3071 const FeatureEntry* GetFeatureEntries(size_t* count) {
3065 *count = arraysize(kFeatureEntries); 3072 *count = arraysize(kFeatureEntries);
3066 return kFeatureEntries; 3073 return kFeatureEntries;
3067 } 3074 }
3068 3075
3069 } // namespace testing 3076 } // namespace testing
3070 3077
3071 } // namespace about_flags 3078 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698