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

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

Issue 2836163002: mash: Shell ref clean up for screen lock (Closed)
Patch Set: rebase, fix compile 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
« no previous file with comments | « ash/public/interfaces/session_controller.mojom ('k') | ash/session/session_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // SessionState more closes matches the state in chrome. 110 // SessionState more closes matches the state in chrome.
111 LoginStatus login_status() const { return login_status_; } 111 LoginStatus login_status() const { return login_status_; }
112 112
113 // mojom::SessionController 113 // mojom::SessionController
114 void SetClient(mojom::SessionControllerClientPtr client) override; 114 void SetClient(mojom::SessionControllerClientPtr client) override;
115 void SetSessionInfo(mojom::SessionInfoPtr info) override; 115 void SetSessionInfo(mojom::SessionInfoPtr info) override;
116 void UpdateUserSession(mojom::UserSessionPtr user_session) override; 116 void UpdateUserSession(mojom::UserSessionPtr user_session) override;
117 void SetUserSessionOrder( 117 void SetUserSessionOrder(
118 const std::vector<uint32_t>& user_session_order) override; 118 const std::vector<uint32_t>& user_session_order) override;
119 void StartLock(const StartLockCallback& callback) override; 119 void StartLock(const StartLockCallback& callback) override;
120 void NotifyChromeLockAnimationsComplete() override;
120 void RunUnlockAnimation(const RunUnlockAnimationCallback& callback) override; 121 void RunUnlockAnimation(const RunUnlockAnimationCallback& callback) override;
121 void NotifyChromeTerminating() override; 122 void NotifyChromeTerminating() override;
122 123
123 // Test helpers. 124 // Test helpers.
124 void ClearUserSessionsForTest(); 125 void ClearUserSessionsForTest();
125 void FlushMojoForTest(); 126 void FlushMojoForTest();
126 void LockScreenAndFlushForTest(); 127 void LockScreenAndFlushForTest();
127 128
128 private: 129 private:
129 void SetSessionState(session_manager::SessionState state); 130 void SetSessionState(session_manager::SessionState state);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 base::ObserverList<ash::SessionObserver> observers_; 179 base::ObserverList<ash::SessionObserver> observers_;
179 180
180 base::WeakPtrFactory<SessionController> weak_ptr_factory_; 181 base::WeakPtrFactory<SessionController> weak_ptr_factory_;
181 182
182 DISALLOW_COPY_AND_ASSIGN(SessionController); 183 DISALLOW_COPY_AND_ASSIGN(SessionController);
183 }; 184 };
184 185
185 } // namespace ash 186 } // namespace ash
186 187
187 #endif // ASH_SESSION_SESSION_CONTROLLER_H_ 188 #endif // ASH_SESSION_SESSION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/public/interfaces/session_controller.mojom ('k') | ash/session/session_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698