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 2084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2095 {"enable-nostate-prefetch", IDS_FLAGS_NOSTATE_PREFETCH, | 2095 {"enable-nostate-prefetch", IDS_FLAGS_NOSTATE_PREFETCH, |
2096 IDS_FLAGS_NOSTATE_PREFETCH_DESCRIPTION, kOsAll, | 2096 IDS_FLAGS_NOSTATE_PREFETCH_DESCRIPTION, kOsAll, |
2097 FEATURE_WITH_VARIATIONS_VALUE_TYPE(prerender::kNoStatePrefetchFeature, | 2097 FEATURE_WITH_VARIATIONS_VALUE_TYPE(prerender::kNoStatePrefetchFeature, |
2098 kNoStatePrefetchFeatureVariations, | 2098 kNoStatePrefetchFeatureVariations, |
2099 "NoStatePrefetchValidation")}, | 2099 "NoStatePrefetchValidation")}, |
2100 #if defined(OS_CHROMEOS) | 2100 #if defined(OS_CHROMEOS) |
2101 {"cros-comp-updates", IDS_FLAGS_CROS_COMP_UPDATES_NAME, | 2101 {"cros-comp-updates", IDS_FLAGS_CROS_COMP_UPDATES_NAME, |
2102 IDS_FLAGS_CROS_COMP_UPDATES_DESCRIPTION, kOsCrOS, | 2102 IDS_FLAGS_CROS_COMP_UPDATES_DESCRIPTION, kOsCrOS, |
2103 FEATURE_VALUE_TYPE(features::kCrosCompUpdates)}, | 2103 FEATURE_VALUE_TYPE(features::kCrosCompUpdates)}, |
2104 #endif | 2104 #endif |
| 2105 #if defined(OS_ANDROID) |
| 2106 {"native-android-history-manager", IDS_NATIVE_ANDROID_HISTORY_MANAGER, |
| 2107 IDS_NATIVE_ANDROID_HISTORY_MANAGER_DESCRIPTION, kOsAndroid, |
| 2108 FEATURE_VALUE_TYPE(chrome::android::kNativeAndroidHistoryManager)}, |
| 2109 #endif |
2105 | 2110 |
2106 // NOTE: Adding new command-line switches requires adding corresponding | 2111 // NOTE: Adding new command-line switches requires adding corresponding |
2107 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2112 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2108 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2113 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2109 }; | 2114 }; |
2110 | 2115 |
2111 class FlagsStateSingleton { | 2116 class FlagsStateSingleton { |
2112 public: | 2117 public: |
2113 FlagsStateSingleton() | 2118 FlagsStateSingleton() |
2114 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2119 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2304 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2309 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2305 | 2310 |
2306 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2311 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2307 *count = arraysize(kFeatureEntries); | 2312 *count = arraysize(kFeatureEntries); |
2308 return kFeatureEntries; | 2313 return kFeatureEntries; |
2309 } | 2314 } |
2310 | 2315 |
2311 } // namespace testing | 2316 } // namespace testing |
2312 | 2317 |
2313 } // namespace about_flags | 2318 } // namespace about_flags |
OLD | NEW |