Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2848473002: cros: Enable encryption migration UI by default. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after
2272 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription, 2272 flag_descriptions::kDisableSystemTimezoneAutomaticDetectionDescription,
2273 kOsCrOS, 2273 kOsCrOS,
2274 SINGLE_VALUE_TYPE( 2274 SINGLE_VALUE_TYPE(
2275 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)}, 2275 chromeos::switches::kDisableSystemTimezoneAutomaticDetectionPolicy)},
2276 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName, 2276 {"disable-native-cups", flag_descriptions::kDisableNativeCupsName,
2277 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS, 2277 flag_descriptions::kDisableNativeCupsDescription, kOsCrOS,
2278 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)}, 2278 SINGLE_VALUE_TYPE(switches::kDisableNativeCups)},
2279 {"enable-encryption-migration", 2279 {"enable-encryption-migration",
2280 flag_descriptions::kEnableEncryptionMigrationName, 2280 flag_descriptions::kEnableEncryptionMigrationName,
2281 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, 2281 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS,
2282 SINGLE_VALUE_TYPE(chromeos::switches::kEnableEncryptionMigration)}, 2282 ENABLE_DISABLE_VALUE_TYPE(
2283 chromeos::switches::kEnableEncryptionMigration,
2284 chromeos::switches::kDisableEncryptionMigration)},
2283 #endif // OS_CHROMEOS 2285 #endif // OS_CHROMEOS
2284 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) 2286 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD)
2285 {"enable-google-branded-context-menu", 2287 {"enable-google-branded-context-menu",
2286 flag_descriptions::kGoogleBrandedContextMenuName, 2288 flag_descriptions::kGoogleBrandedContextMenuName,
2287 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop, 2289 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop,
2288 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 2290 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
2289 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD 2291 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD
2290 #if defined(OS_MACOSX) 2292 #if defined(OS_MACOSX)
2291 {"enable-fullscreen-in-tab-detaching", 2293 {"enable-fullscreen-in-tab-detaching",
2292 flag_descriptions::kTabDetachingInFullscreenName, 2294 flag_descriptions::kTabDetachingInFullscreenName,
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
2932 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2934 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2933 2935
2934 const FeatureEntry* GetFeatureEntries(size_t* count) { 2936 const FeatureEntry* GetFeatureEntries(size_t* count) {
2935 *count = arraysize(kFeatureEntries); 2937 *count = arraysize(kFeatureEntries);
2936 return kFeatureEntries; 2938 return kFeatureEntries;
2937 } 2939 }
2938 2940
2939 } // namespace testing 2941 } // namespace testing
2940 2942
2941 } // namespace about_flags 2943 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698