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 2292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2303 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, | 2303 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, |
2304 {"disable-system-timezone-automatic-detection", | 2304 {"disable-system-timezone-automatic-detection", |
2305 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionName, | 2305 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionName, |
2306 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, | 2306 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, |
2307 kOsCrOS, | 2307 kOsCrOS, |
2308 SINGLE_VALUE_TYPE( | 2308 SINGLE_VALUE_TYPE( |
2309 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, | 2309 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, |
2310 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, | 2310 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, |
2311 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, | 2311 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, |
2312 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, | 2312 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, |
| 2313 {"enable-cros-component", flag_descriptions::kCrOSComponentName, |
| 2314 flag_descriptions::kCrOSComponentDescription, kOsCrOS, |
| 2315 FEATURE_VALUE_TYPE(features::kCrOSComponent)}, |
2313 {"enable-encryption-migration", | 2316 {"enable-encryption-migration", |
2314 flag_descriptions::kEnableEncryptionMigrationName, | 2317 flag_descriptions::kEnableEncryptionMigrationName, |
2315 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, | 2318 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, |
2316 ENABLE_DISABLE_VALUE_TYPE( | 2319 ENABLE_DISABLE_VALUE_TYPE( |
2317 chromeos::switches::kEnableEncryptionMigration, | 2320 chromeos::switches::kEnableEncryptionMigration, |
2318 chromeos::switches::kDisableEncryptionMigration)}, | 2321 chromeos::switches::kDisableEncryptionMigration)}, |
2319 #endif // OS_CHROMEOS | 2322 #endif // OS_CHROMEOS |
2320 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) | 2323 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) |
2321 {"enable-google-branded-context-menu", | 2324 {"enable-google-branded-context-menu", |
2322 flag_descriptions::kGoogleBrandedContextMenuName, | 2325 flag_descriptions::kGoogleBrandedContextMenuName, |
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3007 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3010 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3008 | 3011 |
3009 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3012 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3010 *count = arraysize(kFeatureEntries); | 3013 *count = arraysize(kFeatureEntries); |
3011 return kFeatureEntries; | 3014 return kFeatureEntries; |
3012 } | 3015 } |
3013 | 3016 |
3014 } // namespace testing | 3017 } // namespace testing |
3015 | 3018 |
3016 } // namespace about_flags | 3019 } // namespace about_flags |
OLD | NEW |