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

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

Issue 698253002: Supervised user SafeSites: Add a field trial to turn on/off (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 | « 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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 347
348 // Prevents SDCH persistence from being used. 348 // Prevents SDCH persistence from being used.
349 const char kDisableSdchPersistence[] = "disable-sdch-persistence"; 349 const char kDisableSdchPersistence[] = "disable-sdch-persistence";
350 350
351 // Disables using bubbles for session restore request. 351 // Disables using bubbles for session restore request.
352 const char kDisableSessionCrashedBubble[] = "disable-session-crashed-bubble"; 352 const char kDisableSessionCrashedBubble[] = "disable-session-crashed-bubble";
353 353
354 // Disables the suggestions service. 354 // Disables the suggestions service.
355 const char kDisableSuggestionsService[] = "disable-suggestions-service"; 355 const char kDisableSuggestionsService[] = "disable-suggestions-service";
356 356
357 // Disables the supervised user host blacklist.
358 const char kDisableSupervisedUserBlacklist[] =
359 "disable-supervised-user-blacklist";
360
361 // Disables SafeSites filtering for supervised users.
362 const char kDisableSupervisedUserSafeSites[] =
363 "disable-supervised-user-safesites";
364
365 // Disables syncing browser data to a Google Account. 357 // Disables syncing browser data to a Google Account.
366 const char kDisableSync[] = "disable-sync"; 358 const char kDisableSync[] = "disable-sync";
367 359
368 // 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.
369 // 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
370 // should be comma separated, and follow the naming convention for string 362 // should be comma separated, and follow the naming convention for string
371 // representation of model types, e.g.: 363 // representation of model types, e.g.:
372 // --disable-synctypes='Typed URLs, Bookmarks, Autofill Profiles' 364 // --disable-synctypes='Typed URLs, Bookmarks, Autofill Profiles'
373 const char kDisableSyncTypes[] = "disable-sync-types"; 365 const char kDisableSyncTypes[] = "disable-sync-types";
374 366
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 // (see SettingsWindowEnabled() below). 560 // (see SettingsWindowEnabled() below).
569 const char kEnableSettingsWindow[] = "enable-settings-window"; 561 const char kEnableSettingsWindow[] = "enable-settings-window";
570 const char kDisableSettingsWindow[] = "disable-settings-window"; 562 const char kDisableSettingsWindow[] = "disable-settings-window";
571 563
572 // Enable SPDY/4, aka HTTP/2. This is a temporary testing flag. 564 // Enable SPDY/4, aka HTTP/2. This is a temporary testing flag.
573 const char kEnableSpdy4[] = "enable-spdy4"; 565 const char kEnableSpdy4[] = "enable-spdy4";
574 566
575 // Enables the suggestions service. 567 // Enables the suggestions service.
576 const char kEnableSuggestionsService[] = "enable-suggestions-service"; 568 const char kEnableSuggestionsService[] = "enable-suggestions-service";
577 569
578 // Enables the supervised user host blacklist.
579 const char kEnableSupervisedUserBlacklist[] =
580 "enable-supervised-user-blacklist";
581
582 // Enables the supervised user managed bookmarks folder. 570 // Enables the supervised user managed bookmarks folder.
583 const char kEnableSupervisedUserManagedBookmarksFolder[] = 571 const char kEnableSupervisedUserManagedBookmarksFolder[] =
584 "enable-supervised-user-managed-bookmarks-folder"; 572 "enable-supervised-user-managed-bookmarks-folder";
585 573
586 // Enables SafeSites filtering for supervised users.
587 const char kEnableSupervisedUserSafeSites[] =
588 "enable-supervised-user-safesites";
589
590 // Enables synced articles. 574 // Enables synced articles.
591 const char kEnableSyncArticles[] = "enable-sync-articles"; 575 const char kEnableSyncArticles[] = "enable-sync-articles";
592 576
593 // Enables user control over muting tab audio from the tab strip. 577 // Enables user control over muting tab audio from the tab strip.
594 const char kEnableTabAudioMuting[] = "enable-tab-audio-muting"; 578 const char kEnableTabAudioMuting[] = "enable-tab-audio-muting";
595 579
596 // Enables fanciful thumbnail processing. Used with NTP for 580 // Enables fanciful thumbnail processing. Used with NTP for
597 // instant-extended-api, where thumbnails are generally smaller. 581 // instant-extended-api, where thumbnails are generally smaller.
598 const char kEnableThumbnailRetargeting[] = "enable-thumbnail-retargeting"; 582 const char kEnableThumbnailRetargeting[] = "enable-thumbnail-retargeting";
599 583
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 const char kSSLVersionTLSv12[] = "tls1.2"; 1103 const char kSSLVersionTLSv12[] = "tls1.2";
1120 1104
1121 // Starts the browser maximized, regardless of any previous settings. 1105 // Starts the browser maximized, regardless of any previous settings.
1122 const char kStartMaximized[] = "start-maximized"; 1106 const char kStartMaximized[] = "start-maximized";
1123 1107
1124 // Sets the supervised user ID for any loaded or newly created profile to the 1108 // Sets the supervised user ID for any loaded or newly created profile to the
1125 // given value. Pass an empty string to mark the profile as non-supervised. 1109 // given value. Pass an empty string to mark the profile as non-supervised.
1126 // Used for testing. 1110 // Used for testing.
1127 const char kSupervisedUserId[] = "managed-user-id"; 1111 const char kSupervisedUserId[] = "managed-user-id";
1128 1112
1113 // Enables/disables SafeSites filtering for supervised users. Possible values
1114 // are "enabled", "disabled", "blacklist-only", and "online-check-only".
1115 const char kSupervisedUserSafeSites[] = "supervised-user-safesites";
1116
1129 // Used to authenticate requests to the Sync service for supervised users. 1117 // Used to authenticate requests to the Sync service for supervised users.
1130 // Setting this switch also causes Sync to be set up for a supervised user. 1118 // Setting this switch also causes Sync to be set up for a supervised user.
1131 const char kSupervisedUserSyncToken[] = "managed-user-sync-token"; 1119 const char kSupervisedUserSyncToken[] = "managed-user-sync-token";
1132 1120
1133 // This flag causes sync to retry very quickly (see polling_constants.h) the 1121 // This flag causes sync to retry very quickly (see polling_constants.h) the
1134 // when it encounters an error, as the first step towards exponential backoff. 1122 // when it encounters an error, as the first step towards exponential backoff.
1135 const char kSyncShortInitialRetryOverride[] = 1123 const char kSyncShortInitialRetryOverride[] =
1136 "sync-short-initial-retry-override"; 1124 "sync-short-initial-retry-override";
1137 1125
1138 // Overrides the default server used for profile sync. 1126 // Overrides the default server used for profile sync.
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 1400
1413 // ----------------------------------------------------------------------------- 1401 // -----------------------------------------------------------------------------
1414 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1402 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1415 // 1403 //
1416 // You were going to just dump your switches here, weren't you? Instead, please 1404 // You were going to just dump your switches here, weren't you? Instead, please
1417 // put them in alphabetical order above, or in order inside the appropriate 1405 // put them in alphabetical order above, or in order inside the appropriate
1418 // ifdef at the bottom. The order should match the header. 1406 // ifdef at the bottom. The order should match the header.
1419 // ----------------------------------------------------------------------------- 1407 // -----------------------------------------------------------------------------
1420 1408
1421 } // namespace switches 1409 } // 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