chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h - 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.h

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

Patch Set: 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.h ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e3342831abdf4cd45898db2f1b1b83afb6c3580c..71dad7bbcbcf1ea71145b9c37c13e9c6573f8f78 100644

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

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

@@ -22,7 +22,10 @@

class Browser;

class MultiUserNotificationBlockerChromeOS;

class MultiUserNotificationBlockerChromeOSTest;

-class Profile;

+namespace content {

+class BrowserContext;

namespace aura {

class Window;

@@ -73,9 +76,10 @@ class MultiUserWindowManagerChromeOS

std::set<std::string>* user_ids) OVERRIDE;

virtual bool IsWindowOnDesktopOfUser(aura::Window* window,

const std::string& user_id) OVERRIDE;

+ virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;

virtual const std::string& GetUserPresentingWindow(

aura::Window* window) OVERRIDE;

- virtual void AddUser(Profile* profile) OVERRIDE;

+ virtual void AddUser(content::BrowserContext* context) OVERRIDE;

virtual void AddObserver(Observer* observer) OVERRIDE;

virtual void RemoveObserver(Observer* observer) OVERRIDE;