| 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 2277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2288 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, | 2288 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, |
| 2289 kOsCrOS, | 2289 kOsCrOS, |
| 2290 SINGLE_VALUE_TYPE( | 2290 SINGLE_VALUE_TYPE( |
| 2291 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, | 2291 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, |
| 2292 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, | 2292 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, |
| 2293 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, | 2293 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, |
| 2294 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, | 2294 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, |
| 2295 {"enable-encryption-migration", | 2295 {"enable-encryption-migration", |
| 2296 flag_descriptions::kEnableEncryptionMigrationName, | 2296 flag_descriptions::kEnableEncryptionMigrationName, |
| 2297 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, | 2297 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, |
| 2298 SINGLE_VALUE_TYPE(chromeos::switches::kEnableEncryptionMigration)}, | 2298 ENABLE_DISABLE_VALUE_TYPE( |
| 2299 chromeos::switches::kEnableEncryptionMigration, |
| 2300 chromeos::switches::kDisableEncryptionMigration)}, |
| 2299 #endif // OS_CHROMEOS | 2301 #endif // OS_CHROMEOS |
| 2300 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) | 2302 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) |
| 2301 {"enable-google-branded-context-menu", | 2303 {"enable-google-branded-context-menu", |
| 2302 flag_descriptions::kGoogleBrandedContextMenuName, | 2304 flag_descriptions::kGoogleBrandedContextMenuName, |
| 2303 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop, | 2305 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop, |
| 2304 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, | 2306 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, |
| 2305 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD | 2307 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD |
| 2306 #if defined(OS_MACOSX) | 2308 #if defined(OS_MACOSX) |
| 2307 {"enable-fullscreen-in-tab-detaching", | 2309 {"enable-fullscreen-in-tab-detaching", |
| 2308 flag_descriptions::kTabDetachingInFullscreenName, | 2310 flag_descriptions::kTabDetachingInFullscreenName, |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2959 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2961 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2960 | 2962 |
| 2961 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2963 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2962 *count = arraysize(kFeatureEntries); | 2964 *count = arraysize(kFeatureEntries); |
| 2963 return kFeatureEntries; | 2965 return kFeatureEntries; |
| 2964 } | 2966 } |
| 2965 | 2967 |
| 2966 } // namespace testing | 2968 } // namespace testing |
| 2967 | 2969 |
| 2968 } // namespace about_flags | 2970 } // namespace about_flags |
| OLD | NEW |