ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy.

chrome/browser/ui/webui/options/browser_options_handler.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/browser/ui/webui/options/browser_options_handler.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 477 matching lines @@
 
 #if defined(ENABLE_SETTINGS_APP)
     { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
 #endif  // defined(ENABLE_SETTINGS_APP)
 
 #if defined(ENABLE_SERVICE_DISCOVERY)
     { "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON },
     { "cloudPrintEnableNotificationsLabel",
       IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
 #endif  // defined(ENABLE_SERVICE_DISCOVERY)
+#if defined(OS_CHROMEOS)
+    { "captivePortalBypassProxy",
+      IDS_OPTIONS_CAPTIVE_PORTAL_BYPASS_PROXY_LABEL },
+#endif
   };
 
 #if defined(ENABLE_SETTINGS_APP)
   static OptionsStringResource app_resources[] = {
     { "syncOverview", IDS_SETTINGS_APP_SYNC_OVERVIEW },
     { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL,
       IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
     { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
       IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
     { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
@@ skipping 143 matching lines @@
                      base::CommandLine::ForCurrentProcess()->HasSwitch(
                          proximity_auth::switches::kEnableProximityDetection));
 
 #if defined(OS_CHROMEOS)
   values->SetBoolean("consumerManagementEnabled",
                      base::CommandLine::ForCurrentProcess()->HasSwitch(
                          chromeos::switches::kEnableConsumerManagement));
 
   RegisterTitle(values, "thirdPartyImeConfirmOverlay",
                 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);
+
+  values->SetBoolean(
+      "enableCaptivePortalBypassProxyOption",
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kEnableCaptivePortalBypassProxyOption));
 #endif
 
   values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());
 
   values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
 
   values->SetBoolean("websiteSettingsManagerEnabled",
                      base::CommandLine::ForCurrentProcess()->HasSwitch(
                          switches::kEnableWebsiteSettingsManager));
 
@@ skipping 1502 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options