Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
index a40eb9ef9cc59fef8869a2613a17deacf2beddcd..2ce680435fbf7aca2e7874abe1d0db6ab6bed847 100644 |
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
@@ -495,6 +495,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
{ "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) |
@@ -658,6 +662,11 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
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()); |