chrome/browser/chromeos/proxy_config_service_impl.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/proxy_config_service_impl.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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:

Index: chrome/browser/chromeos/proxy_config_service_impl.cc

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

index d66ccc271bdfb34219e333a6a10b382007f42d99..89d07f6234ecc0f1de6bfac35201cc196c8f3b73 100644

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

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

@@ -143,7 +143,8 @@ bool ProxyConfigServiceImpl::IgnoreProxy(const PrefService* profile_prefs,

if (onc_source == ::onc::ONC_SOURCE_DEVICE_POLICY) {

policy::BrowserPolicyConnectorChromeOS* connector =

g_browser_process->platform_part()->browser_policy_connector_chromeos();

- const User* logged_in_user = UserManager::Get()->GetLoggedInUser();

+ const user_manager::User* logged_in_user =

+ UserManager::Get()->GetLoggedInUser();

if (connector->GetUserAffiliation(logged_in_user->email()) ==

policy::USER_AFFILIATION_MANAGED) {

VLOG(1) << "Respecting proxy for network, as logged-in user belongs to "