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

Unified Diff: chrome/browser/chromeos/ownership/owner_settings_service_factory.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: chrome/browser/chromeos/ownership/owner_settings_service_factory.cc
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc b/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc
index 9cf55d4122b103934efa09d71f2e17aca83e97cd..3154df4deb93e44218fe10494c07cb2909f7cff9 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_factory.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/ownership/owner_settings_service.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
namespace chromeos {
@@ -36,9 +36,10 @@ OwnerSettingsServiceFactory* OwnerSettingsServiceFactory::GetInstance() {
void OwnerSettingsServiceFactory::SetUsername(const std::string& username) {
username_ = username;
- if (!UserManager::IsInitialized())
+ if (!user_manager::UserManager::IsInitialized())
return;
- const user_manager::User* user = UserManager::Get()->FindUser(username_);
+ const user_manager::User* user =
+ user_manager::UserManager::Get()->FindUser(username_);
if (!user || !user->is_profile_created())
return;
Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);

Powered by Google App Engine
This is Rietveld 408576698