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

Side by Side Diff: ash/session/session_controller.h

Issue 2836163002: mash: Shell ref clean up for screen lock (Closed)
Patch Set: Created 3 years, 8 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ASH_SESSION_SESSION_CONTROLLER_H_ 5 #ifndef ASH_SESSION_SESSION_CONTROLLER_H_
6 #define ASH_SESSION_SESSION_CONTROLLER_H_ 6 #define ASH_SESSION_SESSION_CONTROLLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // SessionState more closes matches the state in chrome. 113 // SessionState more closes matches the state in chrome.
114 LoginStatus login_status() const { return login_status_; } 114 LoginStatus login_status() const { return login_status_; }
115 115
116 // mojom::SessionController 116 // mojom::SessionController
117 void SetClient(mojom::SessionControllerClientPtr client) override; 117 void SetClient(mojom::SessionControllerClientPtr client) override;
118 void SetSessionInfo(mojom::SessionInfoPtr info) override; 118 void SetSessionInfo(mojom::SessionInfoPtr info) override;
119 void UpdateUserSession(mojom::UserSessionPtr user_session) override; 119 void UpdateUserSession(mojom::UserSessionPtr user_session) override;
120 void SetUserSessionOrder( 120 void SetUserSessionOrder(
121 const std::vector<uint32_t>& user_session_order) override; 121 const std::vector<uint32_t>& user_session_order) override;
122 void StartLock(const StartLockCallback& callback) override; 122 void StartLock(const StartLockCallback& callback) override;
123 void NotifyChromeLockAnimationsComplete() override;
123 void RunUnlockAnimation(const RunUnlockAnimationCallback& callback) override; 124 void RunUnlockAnimation(const RunUnlockAnimationCallback& callback) override;
124 void NotifyChromeTerminating() override; 125 void NotifyChromeTerminating() override;
125 126
126 // Test helpers. 127 // Test helpers.
127 void ClearUserSessionsForTest(); 128 void ClearUserSessionsForTest();
128 void FlushMojoForTest(); 129 void FlushMojoForTest();
129 void LockScreenAndFlushForTest(); 130 void LockScreenAndFlushForTest();
130 131
131 private: 132 private:
132 void SetSessionState(session_manager::SessionState state); 133 void SetSessionState(session_manager::SessionState state);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 base::ObserverList<ash::SessionObserver> observers_; 182 base::ObserverList<ash::SessionObserver> observers_;
182 183
183 base::WeakPtrFactory<SessionController> weak_ptr_factory_; 184 base::WeakPtrFactory<SessionController> weak_ptr_factory_;
184 185
185 DISALLOW_COPY_AND_ASSIGN(SessionController); 186 DISALLOW_COPY_AND_ASSIGN(SessionController);
186 }; 187 };
187 188
188 } // namespace ash 189 } // namespace ash
189 190
190 #endif // ASH_SESSION_SESSION_CONTROLLER_H_ 191 #endif // ASH_SESSION_SESSION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698