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

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: Tests fixed. Created 5 years, 10 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
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698