chrome/browser/chromeos/preferences.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/chromeos/preferences.cc

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

Patch Set: 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/net/network_portal_notification_controller.cc ('k') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('j') | chrome/browser/policy/configuration_policy_handler_list_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index 6ab83e2f9f6e41b19920cf30e8dc5a7434cfd1d1..4f0429624c2b9a91da1bf7423625b03d9f0614f6 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -24,6 +24,7 @@

#include "chrome/browser/chromeos/drive/file_system_util.h"

#include "chrome/browser/chromeos/input_method/input_method_syncer.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

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

#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"

#include "chrome/browser/chromeos/system/input_device_settings.h"

#include "chrome/browser/download/download_prefs.h"

@@ -320,7 +321,13 @@ void Preferences::RegisterProfilePrefs(

false,

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

bartfab (slow) 2014/12/19 12:08:54 Nit: No need for two blank lines.

Alexander Alekseev 2014/12/22 22:20:11 Done.

input_method::InputMethodSyncer::RegisterProfilePrefs(registry);

+ registry->RegisterIntegerPref(

+ prefs::kCaptivePortalAuthenticationIgnoresProxy,

+ CAPTIVE_PORTAL_AUTH_IGNORE_PROXY_USER_CONFIGURABLE,

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

}

void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) {