chrome/browser/policy/configuration_policy_handler_list_factory.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/policy/configuration_policy_handler_list_factory.cc

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 6 years 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_notification_controller.cc ('K') | « chrome/browser/chromeos/preferences.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | chrome/common/pref_names.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

index ba7269a7b3a50298dbb53174278e365f9ab80135..af90c6d97cf43c1f1992fb093765da7168e6bd77 100644

--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc

+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -41,6 +41,7 @@

#endif

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/net/captive_portal_ignore_proxy_policy_values.h"

#include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"

#include "chromeos/dbus/power_policy_controller.h"

#include "components/user_manager/user.h"

@@ -819,6 +820,13 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(

SCHEMA_STRICT,

SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,

SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));

+ handlers->AddHandler(

+ make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler(

+ key::kCaptivePortalAuthenticationIgnoresProxy,

+ prefs::kCaptivePortalAuthenticationIgnoresProxy,

+ chromeos::CAPTIVE_PORTAL_AUTH_IGNORE_PROXY_FALSE,

+ chromeos::CAPTIVE_PORTAL_AUTH_IGNORE_PROXY_USER_CONFIGURABLE,

+ false)));

#endif // defined(OS_CHROMEOS)

return handlers.Pass();