chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc - Issue 197773004: Move avatar holder code to ash

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/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

Issue 197773004: Move avatar holder code to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: clang fix Created 6 years, 9 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

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

index a77631ab3bdda85ebd1e0e2a6185100173a98861..154484f6d432d4944500a3fb699c84fac24a98f0 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

@@ -373,7 +373,8 @@ const std::string& MultiUserWindowManagerChromeOS::GetUserPresentingWindow(

return it->second->show_for_user();

}

-void MultiUserWindowManagerChromeOS::AddUser(Profile* profile) {

+void MultiUserWindowManagerChromeOS::AddUser(content::BrowserContext* context) {

+ Profile* profile = Profile::FromBrowserContext(context);

const std::string& user_id = multi_user_util::GetUserIDFromProfile(profile);

if (user_id_to_app_observer_.find(user_id) != user_id_to_app_observer_.end())

return;