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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/session_state_delegate_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
« chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc ('K') | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/session_state_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
index 01779d44a305a05e169905c0d7d6720f46d17c36..89a7d95ebc781d47b53888bea5154454b34637cf 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -23,6 +23,8 @@ class SessionStateDelegateChromeos
virtual ~SessionStateDelegateChromeos();
// ash::SessionStateDelegate:
+ virtual content::BrowserContext* GetBrowserContextByIndex(
+ ash::MultiProfileIndex index) OVERRIDE;
virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
virtual int NumberOfLoggedInUsers() const OVERRIDE;
virtual bool IsActiveUserSessionStarted() const OVERRIDE;
@@ -39,8 +41,8 @@ class SessionStateDelegateChromeos
virtual const std::string GetUserID(
ash::MultiProfileIndex index) const OVERRIDE;
virtual const gfx::ImageSkia& GetUserImage(
- ash::MultiProfileIndex index) const OVERRIDE;
- virtual void GetLoggedInUsers(ash::UserIdList* users) OVERRIDE;
+ content::BrowserContext* context) const OVERRIDE;
+ virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
virtual void AddSessionStateObserver(
« chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc ('K') | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698