chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/policy/user_network_configuration_updater_factory.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc ('k') | chrome/browser/chromeos/preferences.h » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

index f332147efe30a6216c44f220fce627a8f747d1ce..5d22dc7f1d08a9ec8b35bc40657a981d25cb01d3 100644

--- a/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

@@ -5,7 +5,6 @@

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

#include "base/memory/singleton.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

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

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/policy/profile_policy_connector.h"

@@ -17,6 +16,7 @@

#include "components/keyed_service/content/browser_context_dependency_manager.h"

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

#include "components/user_manager/user.h"

+#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

namespace policy {

@@ -71,7 +71,7 @@ KeyedService* UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor(

DCHECK(user);

// Currently, only the network policy of the primary user is supported. See

// also http://crbug.com/310685 .

- if (user != chromeos::UserManager::Get()->GetPrimaryUser())

+ if (user != user_manager::UserManager::Get()->GetPrimaryUser())

return NULL;

const bool allow_trusted_certs_from_policy =