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 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2128 {"enable-webfonts-intervention", | 2128 {"enable-webfonts-intervention", |
2129 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME, | 2129 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME, |
2130 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, | 2130 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, |
2131 kOsAll, | 2131 kOsAll, |
2132 FEATURE_VALUE_TYPE(features::kWebFontsIntervention)}, | 2132 FEATURE_VALUE_TYPE(features::kWebFontsIntervention)}, |
2133 {"enable-grouped-history", | 2133 {"enable-grouped-history", |
2134 IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, | 2134 IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, |
2135 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, | 2135 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, |
2136 kOsDesktop, | 2136 kOsDesktop, |
2137 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, | 2137 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, |
| 2138 #if defined(OS_ANDROID) |
| 2139 {"use-ime-thread", IDS_FLAGS_USE_IME_THREAD_NAME, |
| 2140 IDS_FLAGS_USE_IME_THREAD_DESCRIPTION, kOsAndroid, |
| 2141 SINGLE_VALUE_TYPE(switches::kUseImeThread)}, |
| 2142 #endif // defined(OS_ANDROID) |
2138 // NOTE: Adding new command-line switches requires adding corresponding | 2143 // NOTE: Adding new command-line switches requires adding corresponding |
2139 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2144 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2140 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2145 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2141 }; | 2146 }; |
2142 | 2147 |
2143 class FlagsStateSingleton { | 2148 class FlagsStateSingleton { |
2144 public: | 2149 public: |
2145 FlagsStateSingleton() | 2150 FlagsStateSingleton() |
2146 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2151 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2147 ~FlagsStateSingleton() {} | 2152 ~FlagsStateSingleton() {} |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2341 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2346 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2342 | 2347 |
2343 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2348 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2344 *count = arraysize(kFeatureEntries); | 2349 *count = arraysize(kFeatureEntries); |
2345 return kFeatureEntries; | 2350 return kFeatureEntries; |
2346 } | 2351 } |
2347 | 2352 |
2348 } // namespace testing | 2353 } // namespace testing |
2349 | 2354 |
2350 } // namespace about_flags | 2355 } // namespace about_flags |
OLD | NEW |