OLD | NEW |
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 2883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2894 {"use-google-local-ntp", flag_descriptions::kUseGoogleLocalNtpName, | 2894 {"use-google-local-ntp", flag_descriptions::kUseGoogleLocalNtpName, |
2895 flag_descriptions::kUseGoogleLocalNtpDescription, kOsDesktop, | 2895 flag_descriptions::kUseGoogleLocalNtpDescription, kOsDesktop, |
2896 FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)}, | 2896 FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)}, |
2897 | 2897 |
2898 {"one-google-bar-on-local-ntp", | 2898 {"one-google-bar-on-local-ntp", |
2899 flag_descriptions::kOneGoogleBarOnLocalNtpName, | 2899 flag_descriptions::kOneGoogleBarOnLocalNtpName, |
2900 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop, | 2900 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop, |
2901 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)}, | 2901 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)}, |
2902 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 2902 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
2903 | 2903 |
| 2904 #if defined(OS_MACOSX) |
| 2905 {"mac-rtl", flag_descriptions::kMacRTLName, |
| 2906 flag_descriptions::kMacRTLDescription, kOsMac, |
| 2907 FEATURE_VALUE_TYPE(features::kMacRTL)}, |
| 2908 #endif // defined(OS_MACOSX) |
| 2909 |
2904 // NOTE: Adding new command-line switches requires adding corresponding | 2910 // NOTE: Adding new command-line switches requires adding corresponding |
2905 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 2911 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
2906 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2912 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2907 }; | 2913 }; |
2908 | 2914 |
2909 class FlagsStateSingleton { | 2915 class FlagsStateSingleton { |
2910 public: | 2916 public: |
2911 FlagsStateSingleton() | 2917 FlagsStateSingleton() |
2912 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2918 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2913 ~FlagsStateSingleton() {} | 2919 ~FlagsStateSingleton() {} |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3119 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3125 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3120 | 3126 |
3121 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3127 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3122 *count = arraysize(kFeatureEntries); | 3128 *count = arraysize(kFeatureEntries); |
3123 return kFeatureEntries; | 3129 return kFeatureEntries; |
3124 } | 3130 } |
3125 | 3131 |
3126 } // namespace testing | 3132 } // namespace testing |
3127 | 3133 |
3128 } // namespace about_flags | 3134 } // namespace about_flags |
OLD | NEW |