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 2285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2296 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, | 2296 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, |
2297 {"disable-system-timezone-automatic-detection", | 2297 {"disable-system-timezone-automatic-detection", |
2298 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionName, | 2298 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionName, |
2299 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, | 2299 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, |
2300 kOsCrOS, | 2300 kOsCrOS, |
2301 SINGLE_VALUE_TYPE( | 2301 SINGLE_VALUE_TYPE( |
2302 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, | 2302 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, |
2303 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, | 2303 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, |
2304 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, | 2304 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, |
2305 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, | 2305 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, |
2306 {"cros-component", flag_descriptions::kCrOSComponentName, | |
skau
2017/05/03 21:07:49
You want this to say enable-cros-component so it's
xiaochu
2017/05/03 23:40:28
Done.
| |
2307 flag_descriptions::kCrOSComponentDescription, kOsCrOS, | |
2308 FEATURE_VALUE_TYPE(features::kCrOSComponent)}, | |
2306 {"enable-encryption-migration", | 2309 {"enable-encryption-migration", |
2307 flag_descriptions::kEnableEncryptionMigrationName, | 2310 flag_descriptions::kEnableEncryptionMigrationName, |
2308 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, | 2311 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, |
2309 ENABLE_DISABLE_VALUE_TYPE( | 2312 ENABLE_DISABLE_VALUE_TYPE( |
2310 chromeos::switches::kEnableEncryptionMigration, | 2313 chromeos::switches::kEnableEncryptionMigration, |
2311 chromeos::switches::kDisableEncryptionMigration)}, | 2314 chromeos::switches::kDisableEncryptionMigration)}, |
2312 #endif // OS_CHROMEOS | 2315 #endif // OS_CHROMEOS |
2313 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) | 2316 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) |
2314 {"enable-google-branded-context-menu", | 2317 {"enable-google-branded-context-menu", |
2315 flag_descriptions::kGoogleBrandedContextMenuName, | 2318 flag_descriptions::kGoogleBrandedContextMenuName, |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3004 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3007 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3005 | 3008 |
3006 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3009 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3007 *count = arraysize(kFeatureEntries); | 3010 *count = arraysize(kFeatureEntries); |
3008 return kFeatureEntries; | 3011 return kFeatureEntries; |
3009 } | 3012 } |
3010 | 3013 |
3011 } // namespace testing | 3014 } // namespace testing |
3012 | 3015 |
3013 } // namespace about_flags | 3016 } // namespace about_flags |
OLD | NEW |