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

Side by Side Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.h

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_
7 7
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 ash::MultiProfileIndex index) const OVERRIDE; 45 ash::MultiProfileIndex index) const OVERRIDE;
46 virtual const ash::UserInfo* GetUserInfo( 46 virtual const ash::UserInfo* GetUserInfo(
47 content::BrowserContext* context) const OVERRIDE; 47 content::BrowserContext* context) const OVERRIDE;
48 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE; 48 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
49 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE; 49 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
50 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE; 50 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
51 virtual void AddSessionStateObserver( 51 virtual void AddSessionStateObserver(
52 ash::SessionStateObserver* observer) OVERRIDE; 52 ash::SessionStateObserver* observer) OVERRIDE;
53 virtual void RemoveSessionStateObserver( 53 virtual void RemoveSessionStateObserver(
54 ash::SessionStateObserver* observer) OVERRIDE; 54 ash::SessionStateObserver* observer) OVERRIDE;
55 virtual void HideMultiUserSigninScreen() OVERRIDE;
55 56
56 // chromeos::LoginState::Observer overrides. 57 // chromeos::LoginState::Observer overrides.
57 virtual void LoggedInStateChanged() OVERRIDE; 58 virtual void LoggedInStateChanged() OVERRIDE;
58 59
59 // chromeos::UserManager::UserSessionStateObserver: 60 // chromeos::UserManager::UserSessionStateObserver:
60 virtual void ActiveUserChanged(const chromeos::User* active_user) OVERRIDE; 61 virtual void ActiveUserChanged(const chromeos::User* active_user) OVERRIDE;
61 virtual void UserAddedToSession(const chromeos::User* added_user) OVERRIDE; 62 virtual void UserAddedToSession(const chromeos::User* added_user) OVERRIDE;
62 63
63 // chromeos::UserAddingScreen::Observer: 64 // chromeos::UserAddingScreen::Observer:
64 virtual void OnUserAddingStarted() OVERRIDE; 65 virtual void OnUserAddingStarted() OVERRIDE;
(...skipping 11 matching lines...) Expand all
76 // List of observers is only used on Chrome OS for now. 77 // List of observers is only used on Chrome OS for now.
77 ObserverList<ash::SessionStateObserver> session_state_observer_list_; 78 ObserverList<ash::SessionStateObserver> session_state_observer_list_;
78 79
79 // Session state (e.g. login screen vs. user session). 80 // Session state (e.g. login screen vs. user session).
80 SessionState session_state_; 81 SessionState session_state_;
81 82
82 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos); 83 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);
83 }; 84 };
84 85
85 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_ 86 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698