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 2130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2141 {"enable-webfonts-intervention", | 2141 {"enable-webfonts-intervention", |
2142 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME, | 2142 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME, |
2143 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, | 2143 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, |
2144 kOsAll, | 2144 kOsAll, |
2145 FEATURE_VALUE_TYPE(features::kWebFontsIntervention)}, | 2145 FEATURE_VALUE_TYPE(features::kWebFontsIntervention)}, |
2146 {"enable-grouped-history", | 2146 {"enable-grouped-history", |
2147 IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, | 2147 IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, |
2148 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, | 2148 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, |
2149 kOsDesktop, | 2149 kOsDesktop, |
2150 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, | 2150 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, |
| 2151 #if defined(OS_ANDROID) |
| 2152 {"use-ime-thread", IDS_FLAGS_USE_IME_THREAD_NAME, |
| 2153 IDS_FLAGS_USE_IME_THREAD_DESCRIPTION, kOsAndroid, |
| 2154 SINGLE_VALUE_TYPE(switches::kUseImeThread)}, |
| 2155 #endif // defined(OS_ANDROID) |
2151 // NOTE: Adding new command-line switches requires adding corresponding | 2156 // NOTE: Adding new command-line switches requires adding corresponding |
2152 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2157 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2153 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2158 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2154 }; | 2159 }; |
2155 | 2160 |
2156 class FlagsStateSingleton { | 2161 class FlagsStateSingleton { |
2157 public: | 2162 public: |
2158 FlagsStateSingleton() | 2163 FlagsStateSingleton() |
2159 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2164 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2160 ~FlagsStateSingleton() {} | 2165 ~FlagsStateSingleton() {} |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2354 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2359 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2355 | 2360 |
2356 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2361 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2357 *count = arraysize(kFeatureEntries); | 2362 *count = arraysize(kFeatureEntries); |
2358 return kFeatureEntries; | 2363 return kFeatureEntries; |
2359 } | 2364 } |
2360 | 2365 |
2361 } // namespace testing | 2366 } // namespace testing |
2362 | 2367 |
2363 } // namespace about_flags | 2368 } // namespace about_flags |
OLD | NEW |