Enable captive portal detection by default.

chrome/common/chrome_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 116 matching lines @@
 // Causes the automation provider to reinitialize its IPC channel instead of
 // shutting down when a client disconnects.
 const char kAutomationReinitializeOnChannelError[] =
     "automation-reinitialize-on-channel-error";
 
 // Use the (in-progress) refactor of desktop Panel windows which does not
 // require a Browser. Flag will be removed after refactor is ready to replace
 // existing BrowserWindow Panels.
 const char kBrowserlessPanels[] = "browserless-panels";
 
-// This enables automatic captive portal checking on certain network errors.
-// If a captive portal is detected, a login tab will be opened.
-const char kCaptivePortalDetection[]        = "enable-captive-portal-detection";
+// This enables or disables automatic captive portal checking.  A value of "1"
+// enables it, a value of "0" disables it.  All other values use default
+// behavior.  When a captive portal is detected, a login tab will be opened.
+const char kCaptivePortalDetection[]         = "captive-portal-detection";
+const char kCaptivePortalDetectionDisabled[] = "0";
+const char kCaptivePortalDetectionEnabled[]  = "1";
 
 // How often (in seconds) to check for updates. Should only be used for testing
 // purposes.
 const char kCheckForUpdateIntervalSec[]     = "check-for-update-interval";
 
 // Checks the cloud print connector policy, informing the service process if
 // the policy is set to disallow the connector, then quits.
 const char kCheckCloudPrintConnectorPolicy[] =
     "check-cloud-print-connector-policy";
 
@@ skipping 1365 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches