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

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 545193003: Supervised users: Add a cmdline flag and about:flags entry to enable the host blacklist (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update histograms Created 6 years, 3 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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 // Enables a feature that holds back some SSLConnectJobs in order to 597 // Enables a feature that holds back some SSLConnectJobs in order to
598 // minimize the number of full SSL handshakes completed. 598 // minimize the number of full SSL handshakes completed.
599 const char kEnableSSLConnectJobWaiting[] = "enable-ssl-connect-job-waiting"; 599 const char kEnableSSLConnectJobWaiting[] = "enable-ssl-connect-job-waiting";
600 600
601 // Enables an experimental hosted app experience. 601 // Enables an experimental hosted app experience.
602 const char kEnableStreamlinedHostedApps[] = "enable-streamlined-hosted-apps"; 602 const char kEnableStreamlinedHostedApps[] = "enable-streamlined-hosted-apps";
603 603
604 // Enables the suggestions service. 604 // Enables the suggestions service.
605 const char kEnableSuggestionsService[] = "enable-suggestions-service"; 605 const char kEnableSuggestionsService[] = "enable-suggestions-service";
606 606
607 // Enables the supervised user host blacklist.
608 const char kEnableSupervisedUserBlacklist[] =
609 "enable-supervised-user-blacklist";
610
607 // Enables synced notifications. 611 // Enables synced notifications.
608 const char kEnableSyncSyncedNotifications[] = 612 const char kEnableSyncSyncedNotifications[] =
609 "enable-sync-synced-notifications"; 613 "enable-sync-synced-notifications";
610 614
611 // Enables synced articles. 615 // Enables synced articles.
612 const char kEnableSyncArticles[] = "enable-sync-articles"; 616 const char kEnableSyncArticles[] = "enable-sync-articles";
613 617
614 // Enables fanciful thumbnail processing. Used with NTP for 618 // Enables fanciful thumbnail processing. Used with NTP for
615 // instant-extended-api, where thumbnails are generally smaller. 619 // instant-extended-api, where thumbnails are generally smaller.
616 const char kEnableThumbnailRetargeting[] = "enable-thumbnail-retargeting"; 620 const char kEnableThumbnailRetargeting[] = "enable-thumbnail-retargeting";
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 1354
1351 // ----------------------------------------------------------------------------- 1355 // -----------------------------------------------------------------------------
1352 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1356 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1353 // 1357 //
1354 // You were going to just dump your switches here, weren't you? Instead, please 1358 // You were going to just dump your switches here, weren't you? Instead, please
1355 // put them in alphabetical order above, or in order inside the appropriate 1359 // put them in alphabetical order above, or in order inside the appropriate
1356 // ifdef at the bottom. The order should match the header. 1360 // ifdef at the bottom. The order should match the header.
1357 // ----------------------------------------------------------------------------- 1361 // -----------------------------------------------------------------------------
1358 1362
1359 } // namespace switches 1363 } // 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