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

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

Issue 1817443002: Rename mash_shell to mash_session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « mash/session/public/interfaces/session.mojom ('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_SHELL_SHELL_APPLICATION_DELEGATE_H_ 5 #ifndef MASH_SESSION_SESSION_H_
6 #define MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 6 #define MASH_SESSION_SESSION_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "mash/shell/public/interfaces/shell.mojom.h" 13 #include "mash/session/public/interfaces/session.mojom.h"
14 #include "mojo/public/cpp/bindings/binding_set.h" 14 #include "mojo/public/cpp/bindings/binding_set.h"
15 #include "mojo/public/cpp/bindings/interface_ptr_set.h" 15 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
16 #include "mojo/shell/public/cpp/interface_factory.h" 16 #include "mojo/shell/public/cpp/interface_factory.h"
17 #include "mojo/shell/public/cpp/shell_client.h" 17 #include "mojo/shell/public/cpp/shell_client.h"
18 18
19 namespace mojo { 19 namespace mojo {
20 class Connection; 20 class Connection;
21 } 21 }
22 22
23 namespace mash { 23 namespace mash {
24 namespace shell { 24 namespace session {
25 25
26 class ShellApplicationDelegate 26 class Session : public mojo::ShellClient,
27 : public mojo::ShellClient, 27 public mojom::Session,
28 public mash::shell::mojom::Shell, 28 public mojo::InterfaceFactory<mojom::Session> {
29 public mojo::InterfaceFactory<mash::shell::mojom::Shell> {
30 public: 29 public:
31 ShellApplicationDelegate(); 30 Session();
32 ~ShellApplicationDelegate() override; 31 ~Session() override;
33 32
34 private: 33 private:
35 // mojo::ShellClient: 34 // mojo::ShellClient:
36 void Initialize(mojo::Connector* connector, 35 void Initialize(mojo::Connector* connector,
37 const mojo::Identity& identity, 36 const mojo::Identity& identity,
38 uint32_t id) override; 37 uint32_t id) override;
39 bool AcceptConnection(mojo::Connection* connection) override; 38 bool AcceptConnection(mojo::Connection* connection) override;
40 39
41 // mash::shell::mojom::Shell: 40 // mojom::Session:
42 void Logout() override; 41 void Logout() override;
43 void SwitchUser() override; 42 void SwitchUser() override;
44 void AddScreenlockStateListener( 43 void AddScreenlockStateListener(
45 mojom::ScreenlockStateListenerPtr listener) override; 44 mojom::ScreenlockStateListenerPtr listener) override;
46 void LockScreen() override; 45 void LockScreen() override;
47 void UnlockScreen() override; 46 void UnlockScreen() override;
48 47
49 // mojo::InterfaceFactory<mash::shell::mojom::Shell>: 48 // mojo::InterfaceFactory<mojom::Session>:
50 void Create(mojo::Connection* connection, 49 void Create(mojo::Connection* connection,
51 mojo::InterfaceRequest<mash::shell::mojom::Shell> r) override; 50 mojom::SessionRequest request) override;
52 51
53 void StartWindowManager(); 52 void StartWindowManager();
54 void StartSystemUI(); 53 void StartSystemUI();
55 void StartBrowserDriver(); 54 void StartBrowserDriver();
56 void StartQuickLaunch(); 55 void StartQuickLaunch();
57 56
58 void StartScreenlock(); 57 void StartScreenlock();
59 void StopScreenlock(); 58 void StopScreenlock();
60 59
61 // Starts the application at |url|, running |restart_callback| if the 60 // Starts the application at |url|, running |restart_callback| if the
62 // connection to the application is closed. 61 // connection to the application is closed.
63 void StartRestartableService(const std::string& url, 62 void StartRestartableService(const std::string& url,
64 const base::Closure& restart_callback); 63 const base::Closure& restart_callback);
65 64
66 mojo::Connector* connector_; 65 mojo::Connector* connector_;
67 std::map<std::string, scoped_ptr<mojo::Connection>> connections_; 66 std::map<std::string, scoped_ptr<mojo::Connection>> connections_;
68 bool screen_locked_; 67 bool screen_locked_;
69 mojo::BindingSet<mash::shell::mojom::Shell> bindings_; 68 mojo::BindingSet<mojom::Session> bindings_;
70 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_; 69 mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
71 70
72 DISALLOW_COPY_AND_ASSIGN(ShellApplicationDelegate); 71 DISALLOW_COPY_AND_ASSIGN(Session);
73 }; 72 };
74 73
75 } // namespace shell 74 } // namespace session
76 } // namespace mash 75 } // namespace mash
77 76
78 #endif // MASH_SHELL_SHELL_APPLICATION_DELEGATE_H_ 77 #endif // MASH_SESSION_SESSION_H_
OLDNEW
« no previous file with comments | « mash/session/public/interfaces/session.mojom ('k') | mash/session/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698