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

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

Issue 2427443002: Replace remaining shell references with service manager (Closed)
Patch Set: 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/login/manifest.json ('k') | mash/task_viewer/manifest.json » ('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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 connections_.erase(connection); 122 connections_.erase(connection);
123 } 123 }
124 124
125 void Session::StartRestartableService( 125 void Session::StartRestartableService(
126 const std::string& url, 126 const std::string& url,
127 const base::Closure& restart_callback) { 127 const base::Closure& restart_callback) {
128 // TODO(beng): This would be the place to insert logic that counted restarts 128 // TODO(beng): This would be the place to insert logic that counted restarts
129 // to avoid infinite crash-restart loops. 129 // to avoid infinite crash-restart loops.
130 std::unique_ptr<service_manager::Connection> connection = 130 std::unique_ptr<service_manager::Connection> connection =
131 connector()->Connect(url); 131 connector()->Connect(url);
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 service
133 // manager.
133 if (connection) { 134 if (connection) {
134 connection->SetConnectionLostClosure( 135 connection->SetConnectionLostClosure(
135 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback)); 136 base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback));
136 connections_[url] = std::move(connection); 137 connections_[url] = std::move(connection);
137 } 138 }
138 } 139 }
139 140
140 } // namespace session 141 } // namespace session
141 } // namespace main 142 } // namespace main
OLDNEW
« no previous file with comments | « mash/login/manifest.json ('k') | mash/task_viewer/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698