chrome/browser/profiles/profile_impl.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/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: 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:

Index: chrome/browser/profiles/profile_impl.cc

diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc

index e84f79559a6ce1a137c72e99db0d41cac73144f7..d1d6325038360357c61fdb6385d17a7b458e472a 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -111,9 +111,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)

@@ -1263,7 +1263,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);

}