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

Side by Side Diff: mash/shell/shell_application_delegate.cc

Issue 1684783002: Rename ServiceProvider to InterfaceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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
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/shell/shell_application_delegate.h" 5 #include "mash/shell/shell_application_delegate.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "mojo/shell/public/cpp/connection.h" 8 #include "mojo/shell/public/cpp/connection.h"
9 #include "mojo/shell/public/cpp/shell.h" 9 #include "mojo/shell/public/cpp/shell.h"
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 112 }
113 113
114 void ShellApplicationDelegate::StartRestartableService( 114 void ShellApplicationDelegate::StartRestartableService(
115 const std::string& url, 115 const std::string& url,
116 const base::Closure& restart_callback) { 116 const base::Closure& restart_callback) {
117 // TODO(beng): This would be the place to insert logic that counted restarts 117 // TODO(beng): This would be the place to insert logic that counted restarts
118 // to avoid infinite crash-restart loops. 118 // to avoid infinite crash-restart loops.
119 scoped_ptr<mojo::Connection> connection = shell_->Connect(url); 119 scoped_ptr<mojo::Connection> connection = shell_->Connect(url);
120 // Note: |connection| may be null if we've lost our connection to the shell. 120 // Note: |connection| may be null if we've lost our connection to the shell.
121 if (connection) { 121 if (connection) {
122 connection->SetRemoteServiceProviderConnectionErrorHandler( 122 connection->SetRemoteInterfaceProviderConnectionErrorHandler(
123 restart_callback); 123 restart_callback);
124 connections_[url] = std::move(connection); 124 connections_[url] = std::move(connection);
125 } 125 }
126 } 126 }
127 127
128 } // namespace shell 128 } // namespace shell
129 } // namespace main 129 } // namespace main
OLDNEW
« no previous file with comments | « extensions/browser/mojo/stash_backend_unittest.cc ('k') | media/mojo/services/android_mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698