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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test and formatted browser_options.html. Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
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 7d807c6b06885335e4f50ed4f1a235863486ab00..23577447e8050f00173f47149796135437d0b433 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -501,6 +501,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "cloudPrintEnableNotificationsLabel",
IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
#endif
+#if defined(OS_CHROMEOS)
+ { "captivePortalBypassProxy",
+ IDS_OPTIONS_CAPTIVE_PORTAL_BYPASS_PROXY_LABEL },
+#endif
};
#if defined(ENABLE_SETTINGS_APP)
@@ -653,6 +657,10 @@ 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::kEnableCaptivePortalBypassProxy));
bartfab (slow) 2015/01/07 17:38:43 AFAICT, this switch does not actually enable bypas
Alexander Alekseev 2015/01/12 18:41:09 Done.
#endif
values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser());

Powered by Google App Engine
This is Rietveld 408576698