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