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

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

Issue 986303002: Re-enable child account detection, now behind a flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enum -> int Created 5 years, 9 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // measurements. 208 // measurements.
209 const char kDisableBackgroundNetworking[] = "disable-background-networking"; 209 const char kDisableBackgroundNetworking[] = "disable-background-networking";
210 210
211 // Disables the bundled PPAPI version of Flash. 211 // Disables the bundled PPAPI version of Flash.
212 const char kDisableBundledPpapiFlash[] = "disable-bundled-ppapi-flash"; 212 const char kDisableBundledPpapiFlash[] = "disable-bundled-ppapi-flash";
213 213
214 // Disable hardware encoding support for Cast Streaming. 214 // Disable hardware encoding support for Cast Streaming.
215 const char kDisableCastStreamingHWEncoding[] = 215 const char kDisableCastStreamingHWEncoding[] =
216 "disable-cast-streaming-hw-encoding"; 216 "disable-cast-streaming-hw-encoding";
217 217
218 // Disables detection of child accounts.
219 const char kDisableChildAccountDetection[] =
220 "disable-child-account-detection";
221
218 // Disables the client-side phishing detection feature. Note that even if 222 // Disables the client-side phishing detection feature. Note that even if
219 // client-side phishing detection is enabled, it will only be active if the 223 // client-side phishing detection is enabled, it will only be active if the
220 // user has opted in to UMA stats and SafeBrowsing is enabled in the 224 // user has opted in to UMA stats and SafeBrowsing is enabled in the
221 // preferences. 225 // preferences.
222 const char kDisableClientSidePhishingDetection[] = 226 const char kDisableClientSidePhishingDetection[] =
223 "disable-client-side-phishing-detection"; 227 "disable-client-side-phishing-detection";
224 228
225 // Disable default component extensions with background pages - useful for 229 // Disable default component extensions with background pages - useful for
226 // performance tests where these pages may interfere with perf results. 230 // performance tests where these pages may interfere with perf results.
227 const char kDisableComponentExtensionsWithBackgroundPages[] = 231 const char kDisableComponentExtensionsWithBackgroundPages[] =
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 393
390 // Enables the experimental asynchronous DNS client. 394 // Enables the experimental asynchronous DNS client.
391 const char kEnableAsyncDns[] = "enable-async-dns"; 395 const char kEnableAsyncDns[] = "enable-async-dns";
392 396
393 // Enables the benchmarking extensions. 397 // Enables the benchmarking extensions.
394 const char kEnableBenchmarking[] = "enable-benchmarking"; 398 const char kEnableBenchmarking[] = "enable-benchmarking";
395 399
396 // Enables the multi-level undo system for bookmarks. 400 // Enables the multi-level undo system for bookmarks.
397 const char kEnableBookmarkUndo[] = "enable-bookmark-undo"; 401 const char kEnableBookmarkUndo[] = "enable-bookmark-undo";
398 402
403 // Enables detection of child accounts.
404 const char kEnableChildAccountDetection[] =
405 "enable-child-account-detection";
406
399 // This applies only when the process type is "service". Enables the Cloud 407 // This applies only when the process type is "service". Enables the Cloud
400 // Print Proxy component within the service process. 408 // Print Proxy component within the service process.
401 const char kEnableCloudPrintProxy[] = "enable-cloud-print-proxy"; 409 const char kEnableCloudPrintProxy[] = "enable-cloud-print-proxy";
402 410
403 // If true devtools experimental settings are enabled. 411 // If true devtools experimental settings are enabled.
404 const char kEnableDevToolsExperiments[] = "enable-devtools-experiments"; 412 const char kEnableDevToolsExperiments[] = "enable-devtools-experiments";
405 413
406 // Enable device discovery notifications. 414 // Enable device discovery notifications.
407 const char kEnableDeviceDiscoveryNotifications[] = 415 const char kEnableDeviceDiscoveryNotifications[] =
408 "enable-device-discovery-notifications"; 416 "enable-device-discovery-notifications";
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 1385
1378 // ----------------------------------------------------------------------------- 1386 // -----------------------------------------------------------------------------
1379 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1387 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1380 // 1388 //
1381 // You were going to just dump your switches here, weren't you? Instead, please 1389 // You were going to just dump your switches here, weren't you? Instead, please
1382 // put them in alphabetical order above, or in order inside the appropriate 1390 // put them in alphabetical order above, or in order inside the appropriate
1383 // ifdef at the bottom. The order should match the header. 1391 // ifdef at the bottom. The order should match the header.
1384 // ----------------------------------------------------------------------------- 1392 // -----------------------------------------------------------------------------
1385 1393
1386 } // namespace switches 1394 } // 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