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

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

Issue 1989333003: mash: Rename browser_driver to app_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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/session.h ('k') | no next file » | 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 #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 13 matching lines...) Expand all
24 namespace mash { 24 namespace mash {
25 namespace session { 25 namespace session {
26 26
27 Session::Session() : connector_(nullptr), screen_locked_(false) {} 27 Session::Session() : connector_(nullptr), screen_locked_(false) {}
28 Session::~Session() {} 28 Session::~Session() {}
29 29
30 void Session::Initialize(shell::Connector* connector, 30 void Session::Initialize(shell::Connector* connector,
31 const shell::Identity& identity, 31 const shell::Identity& identity,
32 uint32_t id) { 32 uint32_t id) {
33 connector_ = connector; 33 connector_ = connector;
34 StartBrowserDriver(); 34 StartAppDriver();
35 StartWindowManager(); 35 StartWindowManager();
36 StartSystemUI(); 36 StartSystemUI();
37 StartQuickLaunch(); 37 StartQuickLaunch();
38 } 38 }
39 39
40 bool Session::AcceptConnection(shell::Connection* connection) { 40 bool Session::AcceptConnection(shell::Connection* connection) {
41 connection->AddInterface<mojom::Session>(this); 41 connection->AddInterface<mojom::Session>(this);
42 return true; 42 return true;
43 } 43 }
44 44
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 base::Bind(&Session::StartWindowManager, 96 base::Bind(&Session::StartWindowManager,
97 base::Unretained(this))); 97 base::Unretained(this)));
98 } 98 }
99 99
100 void Session::StartSystemUI() { 100 void Session::StartSystemUI() {
101 StartRestartableService("mojo:ash_sysui", 101 StartRestartableService("mojo:ash_sysui",
102 base::Bind(&Session::StartSystemUI, 102 base::Bind(&Session::StartSystemUI,
103 base::Unretained(this))); 103 base::Unretained(this)));
104 } 104 }
105 105
106 void Session::StartBrowserDriver() { 106 void Session::StartAppDriver() {
107 StartRestartableService( 107 StartRestartableService(
108 "mojo:browser_driver", 108 "mojo:app_driver",
109 base::Bind(&Session::StartBrowserDriver, 109 base::Bind(&Session::StartAppDriver, base::Unretained(this)));
110 base::Unretained(this)));
111 } 110 }
112 111
113 void Session::StartQuickLaunch() { 112 void Session::StartQuickLaunch() {
114 StartRestartableService( 113 StartRestartableService(
115 "mojo:quick_launch", 114 "mojo:quick_launch",
116 base::Bind(&Session::StartQuickLaunch, 115 base::Bind(&Session::StartQuickLaunch,
117 base::Unretained(this))); 116 base::Unretained(this)));
118 } 117 }
119 118
120 void Session::StartScreenlock() { 119 void Session::StartScreenlock() {
(...skipping 19 matching lines...) Expand all
140 if (connection) { 139 if (connection) {
141 connection->SetConnectionLostClosure( 140 connection->SetConnectionLostClosure(
142 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); 141 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback));
143 connection->AddInterface<mojom::Session>(this); 142 connection->AddInterface<mojom::Session>(this);
144 connections_[url] = std::move(connection); 143 connections_[url] = std::move(connection);
145 } 144 }
146 } 145 }
147 146
148 } // namespace session 147 } // namespace session
149 } // namespace main 148 } // namespace main
OLDNEW
« no previous file with comments | « mash/session/session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698