OLD | NEW |
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 #include "mash/session/session.h" | 5 #include "mash/session/session.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "mash/login/public/interfaces/login.mojom.h" | 10 #include "mash/login/public/interfaces/login.mojom.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 namespace mash { | 24 namespace mash { |
25 namespace session { | 25 namespace session { |
26 | 26 |
27 Session::Session() : screen_locked_(false) {} | 27 Session::Session() : screen_locked_(false) {} |
28 Session::~Session() {} | 28 Session::~Session() {} |
29 | 29 |
30 void Session::OnStart(const shell::Identity& identity) { | 30 void Session::OnStart(const shell::Identity& identity) { |
31 StartAppDriver(); | 31 StartAppDriver(); |
32 StartWindowManager(); | 32 StartWindowManager(); |
33 StartSystemUI(); | |
34 StartQuickLaunch(); | 33 StartQuickLaunch(); |
| 34 // Launch a chrome window for dev convience; don't do this in the long term. |
| 35 connector()->Connect("exe:chrome"); |
35 } | 36 } |
36 | 37 |
37 bool Session::OnConnect(const shell::Identity& remote_identity, | 38 bool Session::OnConnect(const shell::Identity& remote_identity, |
38 shell::InterfaceRegistry* registry) { | 39 shell::InterfaceRegistry* registry) { |
39 registry->AddInterface<mojom::Session>(this); | 40 registry->AddInterface<mojom::Session>(this); |
40 return true; | 41 return true; |
41 } | 42 } |
42 | 43 |
43 void Session::Logout() { | 44 void Session::Logout() { |
44 // TODO(beng): Notify connected listeners that login is happening, potentially | 45 // TODO(beng): Notify connected listeners that login is happening, potentially |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 bindings_.AddBinding(this, std::move(request)); | 89 bindings_.AddBinding(this, std::move(request)); |
89 } | 90 } |
90 | 91 |
91 void Session::StartWindowManager() { | 92 void Session::StartWindowManager() { |
92 StartRestartableService( | 93 StartRestartableService( |
93 "mojo:ash", | 94 "mojo:ash", |
94 base::Bind(&Session::StartWindowManager, | 95 base::Bind(&Session::StartWindowManager, |
95 base::Unretained(this))); | 96 base::Unretained(this))); |
96 } | 97 } |
97 | 98 |
98 void Session::StartSystemUI() { | |
99 StartRestartableService("mojo:ash_sysui", | |
100 base::Bind(&Session::StartSystemUI, | |
101 base::Unretained(this))); | |
102 } | |
103 | |
104 void Session::StartAppDriver() { | 99 void Session::StartAppDriver() { |
105 StartRestartableService( | 100 StartRestartableService( |
106 "mojo:app_driver", | 101 "mojo:app_driver", |
107 base::Bind(&Session::StartAppDriver, base::Unretained(this))); | 102 base::Bind(&Session::StartAppDriver, base::Unretained(this))); |
108 } | 103 } |
109 | 104 |
110 void Session::StartQuickLaunch() { | 105 void Session::StartQuickLaunch() { |
111 StartRestartableService( | 106 StartRestartableService( |
112 "mojo:quick_launch", | 107 "mojo:quick_launch", |
113 base::Bind(&Session::StartQuickLaunch, | 108 base::Bind(&Session::StartQuickLaunch, |
(...skipping 23 matching lines...) Expand all Loading... |
137 // Note: |connection| may be null if we've lost our connection to the shell. | 132 // Note: |connection| may be null if we've lost our connection to the shell. |
138 if (connection) { | 133 if (connection) { |
139 connection->SetConnectionLostClosure( | 134 connection->SetConnectionLostClosure( |
140 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); | 135 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); |
141 connections_[url] = std::move(connection); | 136 connections_[url] = std::move(connection); |
142 } | 137 } |
143 } | 138 } |
144 | 139 |
145 } // namespace session | 140 } // namespace session |
146 } // namespace main | 141 } // namespace main |
OLD | NEW |