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

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

Issue 2389133008: Mash: Replaces "exe:chrome" with "service:content_browser" (Closed)
Patch Set: rebase Created 4 years, 2 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/app_driver/app_driver.cc ('k') | services/catalog/catalog.h » ('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 #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 14 matching lines...) Expand all
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 StartQuickLaunch(); 33 StartQuickLaunch();
34 // Launch a chrome window for dev convience; don't do this in the long term. 34 // Launch a chrome window for dev convience; don't do this in the long term.
35 connector()->Connect("exe:chrome"); 35 connector()->Connect("service:content_browser");
36 } 36 }
37 37
38 bool Session::OnConnect(const shell::Identity& remote_identity, 38 bool Session::OnConnect(const shell::Identity& remote_identity,
39 shell::InterfaceRegistry* registry) { 39 shell::InterfaceRegistry* registry) {
40 registry->AddInterface<mojom::Session>(this); 40 registry->AddInterface<mojom::Session>(this);
41 return true; 41 return true;
42 } 42 }
43 43
44 void Session::Logout() { 44 void Session::Logout() {
45 // TODO(beng): Notify connected listeners that login is happening, potentially 45 // TODO(beng): Notify connected listeners that login is happening, potentially
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // 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.
133 if (connection) { 133 if (connection) {
134 connection->SetConnectionLostClosure( 134 connection->SetConnectionLostClosure(
135 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); 135 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback));
136 connections_[url] = std::move(connection); 136 connections_[url] = std::move(connection);
137 } 137 }
138 } 138 }
139 139
140 } // namespace session 140 } // namespace session
141 } // namespace main 141 } // namespace main
OLDNEW
« no previous file with comments | « mash/app_driver/app_driver.cc ('k') | services/catalog/catalog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698