chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Update after review. 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

« chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/common/pref_names.h » ('j') | chrome/common/pref_names.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 7d807c6b06885335e4f50ed4f1a235863486ab00..a40580f9149f795442baf7c830ed0f768163da0b 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,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());