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 2925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2936 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop, | 2936 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop, |
2937 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)}, | 2937 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)}, |
2938 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 2938 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
2939 | 2939 |
2940 #if defined(OS_MACOSX) | 2940 #if defined(OS_MACOSX) |
2941 {"mac-rtl", flag_descriptions::kMacRTLName, | 2941 {"mac-rtl", flag_descriptions::kMacRTLName, |
2942 flag_descriptions::kMacRTLDescription, kOsMac, | 2942 flag_descriptions::kMacRTLDescription, kOsMac, |
2943 FEATURE_VALUE_TYPE(features::kMacRTL)}, | 2943 FEATURE_VALUE_TYPE(features::kMacRTL)}, |
2944 #endif // defined(OS_MACOSX) | 2944 #endif // defined(OS_MACOSX) |
2945 | 2945 |
| 2946 #if defined(OS_CHROMEOS) |
| 2947 {"disable-new-virtual-keyboard-behavior", |
| 2948 flag_descriptions::kDisableNewVirtualKeyboardBehaviorName, |
| 2949 flag_descriptions::kDisableNewVirtualKeyboardBehaviorDescription, kOsCrOS, |
| 2950 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewVirtualKeyboardBehavior)}, |
| 2951 #endif // defined(OS_CHROMEOS) |
| 2952 |
2946 // NOTE: Adding new command-line switches requires adding corresponding | 2953 // NOTE: Adding new command-line switches requires adding corresponding |
2947 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 2954 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
2948 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2955 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2949 }; | 2956 }; |
2950 | 2957 |
2951 class FlagsStateSingleton { | 2958 class FlagsStateSingleton { |
2952 public: | 2959 public: |
2953 FlagsStateSingleton() | 2960 FlagsStateSingleton() |
2954 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2961 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2955 ~FlagsStateSingleton() {} | 2962 ~FlagsStateSingleton() {} |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3161 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3168 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3162 | 3169 |
3163 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3170 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3164 *count = arraysize(kFeatureEntries); | 3171 *count = arraysize(kFeatureEntries); |
3165 return kFeatureEntries; | 3172 return kFeatureEntries; |
3166 } | 3173 } |
3167 | 3174 |
3168 } // namespace testing | 3175 } // namespace testing |
3169 | 3176 |
3170 } // namespace about_flags | 3177 } // namespace about_flags |
OLD | NEW |