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

Side by Side Diff: mash/session/session.h

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 | « mash/quick_launch/quick_launch.cc ('k') | mash/session/session.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MASH_SESSION_SESSION_H_ 5 #ifndef MASH_SESSION_SESSION_H_
6 #define MASH_SESSION_SESSION_H_ 6 #define MASH_SESSION_SESSION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 15 matching lines...) Expand all
26 class Session : public shell::Service, 26 class Session : public shell::Service,
27 public mojom::Session, 27 public mojom::Session,
28 public shell::InterfaceFactory<mojom::Session> { 28 public shell::InterfaceFactory<mojom::Session> {
29 public: 29 public:
30 Session(); 30 Session();
31 ~Session() override; 31 ~Session() override;
32 32
33 private: 33 private:
34 // shell::Service: 34 // shell::Service:
35 void OnStart(const shell::Identity& identity) override; 35 void OnStart(const shell::Identity& identity) override;
36 bool OnConnect(shell::Connection* connection) override; 36 bool OnConnect(const shell::Identity& remote_identity,
37 shell::InterfaceRegistry* registry) override;
37 38
38 // mojom::Session: 39 // mojom::Session:
39 void Logout() override; 40 void Logout() override;
40 void SwitchUser() override; 41 void SwitchUser() override;
41 void AddScreenlockStateListener( 42 void AddScreenlockStateListener(
42 mojom::ScreenlockStateListenerPtr listener) override; 43 mojom::ScreenlockStateListenerPtr listener) override;
43 void LockScreen() override; 44 void LockScreen() override;
44 void UnlockScreen() override; 45 void UnlockScreen() override;
45 46
46 // shell::InterfaceFactory<mojom::Session>: 47 // shell::InterfaceFactory<mojom::Session>:
(...skipping 18 matching lines...) Expand all
65 mojo::BindingSet<mojom::Session> bindings_; 66 mojo::BindingSet<mojom::Session> bindings_;
66 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; 67 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
67 68
68 DISALLOW_COPY_AND_ASSIGN(Session); 69 DISALLOW_COPY_AND_ASSIGN(Session);
69 }; 70 };
70 71
71 } // namespace session 72 } // namespace session
72 } // namespace mash 73 } // namespace mash
73 74
74 #endif // MASH_SESSION_SESSION_H_ 75 #endif // MASH_SESSION_SESSION_H_
OLDNEW
« no previous file with comments | « mash/quick_launch/quick_launch.cc ('k') | mash/session/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698