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

Side by Side Diff: chrome/common/chrome_switches.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 | « chrome/common/chrome_switches.h ('k') | tools/metrics/histograms/histograms.xml » ('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/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 // Disables using bubbles for session restore request. 340 // Disables using bubbles for session restore request.
341 const char kDisableSessionCrashedBubble[] = "disable-session-crashed-bubble"; 341 const char kDisableSessionCrashedBubble[] = "disable-session-crashed-bubble";
342 342
343 // Disable SPDY/3.1. This is a temporary testing flag. 343 // Disable SPDY/3.1. This is a temporary testing flag.
344 const char kDisableSpdy31[] = "disable-spdy31"; 344 const char kDisableSpdy31[] = "disable-spdy31";
345 345
346 // Disables the suggestions service. 346 // Disables the suggestions service.
347 const char kDisableSuggestionsService[] = "disable-suggestions-service"; 347 const char kDisableSuggestionsService[] = "disable-suggestions-service";
348 348
349 // Disables the supervised user host blacklist.
350 const char kDisableSupervisedUserBlacklist[] =
351 "disable-supervised-user-blacklist";
352
349 // Disables syncing browser data to a Google Account. 353 // Disables syncing browser data to a Google Account.
350 const char kDisableSync[] = "disable-sync"; 354 const char kDisableSync[] = "disable-sync";
351 355
352 // Disable synced notifications. 356 // Disable synced notifications.
353 const char kDisableSyncSyncedNotifications[] = 357 const char kDisableSyncSyncedNotifications[] =
354 "disable-sync-synced-notifications"; 358 "disable-sync-synced-notifications";
355 359
356 // Disables syncing one or more sync data types that are on by default. 360 // Disables syncing one or more sync data types that are on by default.
357 // See sync/internal_api/public/base/model_type.h for possible types. Types 361 // See sync/internal_api/public/base/model_type.h for possible types. Types
358 // should be comma separated, and follow the naming convention for string 362 // should be comma separated, and follow the naming convention for string
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 1355
1352 // ----------------------------------------------------------------------------- 1356 // -----------------------------------------------------------------------------
1353 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1357 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1354 // 1358 //
1355 // You were going to just dump your switches here, weren't you? Instead, please 1359 // You were going to just dump your switches here, weren't you? Instead, please
1356 // put them in alphabetical order above, or in order inside the appropriate 1360 // put them in alphabetical order above, or in order inside the appropriate
1357 // ifdef at the bottom. The order should match the header. 1361 // ifdef at the bottom. The order should match the header.
1358 // ----------------------------------------------------------------------------- 1362 // -----------------------------------------------------------------------------
1359 1363
1360 } // namespace switches 1364 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698