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

Unified Diff: chrome/browser/chromeos/net/onc_utils.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test 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/net/onc_utils.cc
diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc
index 39d9ff88bbe39743010a312caaf2545164fae6cd..2cd57bbf5e263703c18182976bce23e8b4f3bb6b 100644
--- a/chrome/browser/chromeos/net/onc_utils.cc
+++ b/chrome/browser/chromeos/net/onc_utils.cc
@@ -265,7 +265,7 @@ void ImportNetworksForUser(const chromeos::User* user,
const base::DictionaryValue* FindPolicyForActiveUser(
const std::string& guid,
::onc::ONCSource* onc_source) {
- const User* user = UserManager::Get()->GetActiveUser();
+ const User* user = GetUserManager()->GetActiveUser();
std::string username_hash = user ? user->username_hash() : std::string();
return NetworkHandler::Get()->managed_network_configuration_handler()->
FindPolicyByGUID(username_hash, guid, onc_source);
@@ -274,7 +274,7 @@ const base::DictionaryValue* FindPolicyForActiveUser(
const base::DictionaryValue* GetGlobalConfigFromPolicy(bool for_active_user) {
std::string username_hash;
if (for_active_user) {
- const User* user = UserManager::Get()->GetActiveUser();
+ const User* user = GetUserManager()->GetActiveUser();
if (!user) {
LOG(ERROR) << "No user logged in yet.";
return NULL;

Powered by Google App Engine
This is Rietveld 408576698