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 2124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2135 #endif | 2135 #endif |
2136 #if defined(OS_ANDROID) | 2136 #if defined(OS_ANDROID) |
2137 {"enable-expanded-autofill-credit-card-popup", | 2137 {"enable-expanded-autofill-credit-card-popup", |
2138 IDS_FLAGS_ENABLE_EXPANDED_AUTOFILL_CREDIT_CARD_POPUP_LAYOUT, | 2138 IDS_FLAGS_ENABLE_EXPANDED_AUTOFILL_CREDIT_CARD_POPUP_LAYOUT, |
2139 IDS_FLAGS_ENABLE_EXPANDED_AUTOFILL_CREDIT_CARD_POPUP_LAYOUT_DESCRIPTION, | 2139 IDS_FLAGS_ENABLE_EXPANDED_AUTOFILL_CREDIT_CARD_POPUP_LAYOUT_DESCRIPTION, |
2140 kOsAndroid, | 2140 kOsAndroid, |
2141 FEATURE_WITH_VARIATIONS_VALUE_TYPE( | 2141 FEATURE_WITH_VARIATIONS_VALUE_TYPE( |
2142 autofill::kAutofillCreditCardPopupLayout, | 2142 autofill::kAutofillCreditCardPopupLayout, |
2143 kAutofillCreditCardPopupLayoutFeatureVariations, | 2143 kAutofillCreditCardPopupLayoutFeatureVariations, |
2144 "AutofillCreditCardPopupLayout")}, | 2144 "AutofillCreditCardPopupLayout")}, |
| 2145 {"native-android-history-manager", IDS_NATIVE_ANDROID_HISTORY_MANAGER, |
| 2146 IDS_NATIVE_ANDROID_HISTORY_MANAGER_DESCRIPTION, kOsAndroid, |
| 2147 FEATURE_VALUE_TYPE(chrome::android::kNativeAndroidHistoryManager)}, |
2145 #endif // OS_ANDROID | 2148 #endif // OS_ANDROID |
2146 {"enable-faster-location-reload", IDS_FLAGS_FASTER_LOCATION_RELOAD_NAME, | 2149 {"enable-faster-location-reload", IDS_FLAGS_FASTER_LOCATION_RELOAD_NAME, |
2147 IDS_FLAGS_FASTER_LOCATION_RELOAD_DESCRIPTION, kOsAll, | 2150 IDS_FLAGS_FASTER_LOCATION_RELOAD_DESCRIPTION, kOsAll, |
2148 FEATURE_VALUE_TYPE(features::kFasterLocationReload)} | 2151 FEATURE_VALUE_TYPE(features::kFasterLocationReload)} |
2149 | 2152 |
2150 // NOTE: Adding new command-line switches requires adding corresponding | 2153 // NOTE: Adding new command-line switches requires adding corresponding |
2151 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2154 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2152 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2155 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2153 }; | 2156 }; |
2154 | 2157 |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2348 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2351 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2349 | 2352 |
2350 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2353 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2351 *count = arraysize(kFeatureEntries); | 2354 *count = arraysize(kFeatureEntries); |
2352 return kFeatureEntries; | 2355 return kFeatureEntries; |
2353 } | 2356 } |
2354 | 2357 |
2355 } // namespace testing | 2358 } // namespace testing |
2356 | 2359 |
2357 } // namespace about_flags | 2360 } // namespace about_flags |
OLD | NEW |