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 2150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2161 {"enable-grouped-history", | 2161 {"enable-grouped-history", |
2162 IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, | 2162 IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, |
2163 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, | 2163 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, |
2164 kOsDesktop, | 2164 kOsDesktop, |
2165 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, | 2165 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, |
2166 {"enable-token-binding", | 2166 {"enable-token-binding", |
2167 IDS_FLAGS_ENABLE_TOKEN_BINDING_NAME, | 2167 IDS_FLAGS_ENABLE_TOKEN_BINDING_NAME, |
2168 IDS_FLAGS_ENABLE_TOKEN_BINDING_DESCRIPTION, | 2168 IDS_FLAGS_ENABLE_TOKEN_BINDING_DESCRIPTION, |
2169 kOsAll, | 2169 kOsAll, |
2170 FEATURE_VALUE_TYPE(features::kTokenBinding)}, | 2170 FEATURE_VALUE_TYPE(features::kTokenBinding)}, |
| 2171 #if defined(OS_ANDROID) |
| 2172 {"enable-ntp-snippets", |
| 2173 IDS_FLAGS_ENABLE_NTP_SNIPPETS_NAME, |
| 2174 IDS_FLAGS_ENABLE_NTP_SNIPPETS_DESCRIPTION, |
| 2175 kOsAndroid, |
| 2176 FEATURE_VALUE_TYPE(chrome::android::kNTPSnippetsFeature)}, |
| 2177 #endif |
2171 // NOTE: Adding new command-line switches requires adding corresponding | 2178 // NOTE: Adding new command-line switches requires adding corresponding |
2172 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2179 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2173 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2180 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2174 }; | 2181 }; |
2175 | 2182 |
2176 class FlagsStateSingleton { | 2183 class FlagsStateSingleton { |
2177 public: | 2184 public: |
2178 FlagsStateSingleton() | 2185 FlagsStateSingleton() |
2179 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2186 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2180 ~FlagsStateSingleton() {} | 2187 ~FlagsStateSingleton() {} |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2382 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2389 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2383 | 2390 |
2384 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2391 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2385 *count = arraysize(kFeatureEntries); | 2392 *count = arraysize(kFeatureEntries); |
2386 return kFeatureEntries; | 2393 return kFeatureEntries; |
2387 } | 2394 } |
2388 | 2395 |
2389 } // namespace testing | 2396 } // namespace testing |
2390 | 2397 |
2391 } // namespace about_flags | 2398 } // namespace about_flags |
OLD | NEW |