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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_impl.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/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index bd6fa639f1b53acd868d2e6f67858967bb050fc0..106482f08ebe4d47104106bc9a14e0aee7878cf0 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -109,9 +109,9 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/locale_change_guard.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "components/user_manager/user_manager.h"
#endif
#if defined(SPDY_PROXY_AUTH_ORIGIN)
@@ -1246,7 +1246,7 @@ void ProfileImpl::ChangeAppLocale(
if (via != APP_LOCALE_CHANGED_VIA_PUBLIC_SESSION_LOGIN)
local_state->SetString(prefs::kApplicationLocale, new_locale);
- if (chromeos::UserManager::Get()->GetOwnerEmail() ==
+ if (user_manager::UserManager::Get()->GetOwnerEmail() ==
chromeos::ProfileHelper::Get()->GetUserByProfile(this)->email())
local_state->SetString(prefs::kOwnerLocale, new_locale);
}
« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698