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 2106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2117 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, | 2117 FEATURE_VALUE_TYPE(features::kOptInImeMenu)}, |
2118 {"disable-system-timezone-automatic-detection", | 2118 {"disable-system-timezone-automatic-detection", |
2119 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionName, | 2119 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionName, |
2120 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, | 2120 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, |
2121 kOsCrOS, | 2121 kOsCrOS, |
2122 SINGLE_VALUE_TYPE( | 2122 SINGLE_VALUE_TYPE( |
2123 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, | 2123 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, |
2124 {"enable-native-cups", flag_descriptions::kEnableNativeCupsName, | 2124 {"enable-native-cups", flag_descriptions::kEnableNativeCupsName, |
2125 flag_descriptions::kEnableNativeCupsDescription, kOsCrOS, | 2125 flag_descriptions::kEnableNativeCupsDescription, kOsCrOS, |
2126 SINGLE_VALUE_TYPE(switches::kEnableNativeCups)}, | 2126 SINGLE_VALUE_TYPE(switches::kEnableNativeCups)}, |
| 2127 {"enable-encryption-migration", |
| 2128 flag_descriptions::kEnableEncryptionMigrationName, |
| 2129 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, |
| 2130 SINGLE_VALUE_TYPE(chromeos::switches::kEnableEncryptionMigration)}, |
2127 #endif // OS_CHROMEOS | 2131 #endif // OS_CHROMEOS |
2128 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) | 2132 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) |
2129 {"enable-google-branded-context-menu", | 2133 {"enable-google-branded-context-menu", |
2130 flag_descriptions::kGoogleBrandedContextMenuName, | 2134 flag_descriptions::kGoogleBrandedContextMenuName, |
2131 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop, | 2135 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop, |
2132 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, | 2136 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, |
2133 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD | 2137 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD |
2134 #if defined(OS_MACOSX) | 2138 #if defined(OS_MACOSX) |
2135 {"enable-fullscreen-in-tab-detaching", | 2139 {"enable-fullscreen-in-tab-detaching", |
2136 flag_descriptions::kTabDetachingInFullscreenName, | 2140 flag_descriptions::kTabDetachingInFullscreenName, |
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2721 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2725 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2722 | 2726 |
2723 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2727 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2724 *count = arraysize(kFeatureEntries); | 2728 *count = arraysize(kFeatureEntries); |
2725 return kFeatureEntries; | 2729 return kFeatureEntries; |
2726 } | 2730 } |
2727 | 2731 |
2728 } // namespace testing | 2732 } // namespace testing |
2729 | 2733 |
2730 } // namespace about_flags | 2734 } // namespace about_flags |
OLD | NEW |