Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1837)

Unified Diff: chrome/browser/chromeos/policy/user_network_configuration_updater.h

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
Index: chrome/browser/chromeos/policy/user_network_configuration_updater.h
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.h b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
index b4832c4eb29820bebc188b978eb594c719f7997c..e5346651fed44e7c02a555195329c4cafae12a38 100644
--- a/chrome/browser/chromeos/policy/user_network_configuration_updater.h
+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.h
@@ -24,8 +24,11 @@ namespace base {
class ListValue;
}
-namespace chromeos {
+namespace user_manager {
class User;
+}
+
+namespace chromeos {
namespace onc {
class CertificateImporter;
@@ -67,7 +70,7 @@ class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater,
static scoped_ptr<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);
@@ -88,7 +91,7 @@ class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater,
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);
@@ -120,7 +123,7 @@ class UserNetworkConfigurationUpdater : public NetworkConfigurationUpdater,
bool allow_trusted_certificates_from_policy_;
// The user for whom the user policy will be applied.
- const chromeos::User* user_;
+ const user_manager::User* user_;
ObserverList<WebTrustedCertsObserver, true> observer_list_;

Powered by Google App Engine
This is Rietveld 408576698