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

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

Issue 611233005: Supervised user blacklist: Make the cmdline flag an enable/disable type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix histograms.xml Created 6 years, 2 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/common/chrome_switches.h » ('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 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, 1154 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION,
1155 kOsAndroid | kOsCrOS, 1155 kOsAndroid | kOsCrOS,
1156 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService, 1156 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService,
1157 switches::kDisableSuggestionsService) 1157 switches::kDisableSuggestionsService)
1158 }, 1158 },
1159 { 1159 {
1160 "enable-supervised-user-blacklist", 1160 "enable-supervised-user-blacklist",
1161 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME, 1161 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME,
1162 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION, 1162 IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION,
1163 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, 1163 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
1164 SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist) 1164 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist,
1165 switches::kDisableSupervisedUserBlacklist)
1165 }, 1166 },
1166 { 1167 {
1167 "enable-sync-synced-notifications", 1168 "enable-sync-synced-notifications",
1168 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME, 1169 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_NAME,
1169 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION, 1170 IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION,
1170 kOsDesktop, 1171 kOsDesktop,
1171 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications, 1172 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSyncSyncedNotifications,
1172 switches::kDisableSyncSyncedNotifications) 1173 switches::kDisableSyncSyncedNotifications)
1173 }, 1174 },
1174 #if defined(ENABLE_APP_LIST) 1175 #if defined(ENABLE_APP_LIST)
(...skipping 1350 matching lines...) Expand 10 before | Expand all | Expand 10 after
2525 } 2526 }
2526 2527
2527 const Experiment* GetExperiments(size_t* count) { 2528 const Experiment* GetExperiments(size_t* count) {
2528 *count = num_experiments; 2529 *count = num_experiments;
2529 return experiments; 2530 return experiments;
2530 } 2531 }
2531 2532
2532 } // namespace testing 2533 } // namespace testing
2533 2534
2534 } // namespace about_flags 2535 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698