chrome/browser/chromeos/policy/user_network_configuration_updater.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/policy/user_network_configuration_updater.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/user_network_configuration_updater.h ('k') | chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 27173fe13676ad66306be5c3064e09b226839798..447677e70d70c142f7a400b79b8cfc6d40923ef8 100644

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

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

@@ -9,12 +9,12 @@

#include "base/logging.h"

#include "base/values.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

#include "chrome/browser/net/nss_context.h"

#include "chrome/browser/profiles/profile.h"

#include "chromeos/network/managed_network_configuration_handler.h"

#include "chromeos/network/onc/onc_certificate_importer_impl.h"

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

#include "content/public/browser/notification_source.h"

#include "net/cert/x509_certificate.h"

#include "policy/policy_constants.h"

@@ -28,7 +28,7 @@ scoped_ptr<UserNetworkConfigurationUpdater>

UserNetworkConfigurationUpdater::CreateForUserPolicy(

Profile* profile,

bool allow_trusted_certs_from_policy,

- const chromeos::User& user,

+ const user_manager::User& user,

PolicyService* policy_service,

chromeos::ManagedNetworkConfigurationHandler* network_config_handler) {

scoped_ptr<UserNetworkConfigurationUpdater> updater(

@@ -54,7 +54,7 @@ void UserNetworkConfigurationUpdater::RemoveTrustedCertsObserver(

UserNetworkConfigurationUpdater::UserNetworkConfigurationUpdater(

Profile* profile,

bool allow_trusted_certs_from_policy,

- const chromeos::User& user,

+ const user_manager::User& user,

PolicyService* policy_service,

chromeos::ManagedNetworkConfigurationHandler* network_config_handler)

: NetworkConfigurationUpdater(onc::ONC_SOURCE_USER_POLICY,