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

Side by Side Diff: content/common/mojo/service_registry_impl.cc

Issue 1686223002: Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces. (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
« no previous file with comments | « content/common/mojo/service_registry_impl.h ('k') | content/common/render_frame_setup.mojom » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/common/mojo/service_registry_impl.h" 5 #include "content/common/mojo/service_registry_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "mojo/common/common_type_converters.h" 9 #include "mojo/common/common_type_converters.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 ServiceRegistryImpl::ServiceRegistryImpl() 13 ServiceRegistryImpl::ServiceRegistryImpl()
14 : binding_(this), weak_factory_(this) {} 14 : binding_(this), weak_factory_(this) {}
15 15
16 ServiceRegistryImpl::~ServiceRegistryImpl() { 16 ServiceRegistryImpl::~ServiceRegistryImpl() {
17 while (!pending_connects_.empty()) { 17 while (!pending_connects_.empty()) {
18 mojo::CloseRaw(pending_connects_.front().second); 18 mojo::CloseRaw(pending_connects_.front().second);
19 pending_connects_.pop(); 19 pending_connects_.pop();
20 } 20 }
21 } 21 }
22 22
23 void ServiceRegistryImpl::Bind( 23 void ServiceRegistryImpl::Bind(
24 mojo::InterfaceRequest<mojo::InterfaceProvider> request) { 24 mojo::shell::mojom::InterfaceProviderRequest request) {
25 binding_.Bind(std::move(request)); 25 binding_.Bind(std::move(request));
26 binding_.set_connection_error_handler(base::Bind( 26 binding_.set_connection_error_handler(base::Bind(
27 &ServiceRegistryImpl::OnConnectionError, base::Unretained(this))); 27 &ServiceRegistryImpl::OnConnectionError, base::Unretained(this)));
28 } 28 }
29 29
30 void ServiceRegistryImpl::BindRemoteServiceProvider( 30 void ServiceRegistryImpl::BindRemoteServiceProvider(
31 mojo::InterfaceProviderPtr service_provider) { 31 mojo::shell::mojom::InterfaceProviderPtr service_provider) {
32 CHECK(!remote_provider_); 32 CHECK(!remote_provider_);
33 remote_provider_ = std::move(service_provider); 33 remote_provider_ = std::move(service_provider);
34 while (!pending_connects_.empty()) { 34 while (!pending_connects_.empty()) {
35 remote_provider_->GetInterface( 35 remote_provider_->GetInterface(
36 mojo::String::From(pending_connects_.front().first), 36 mojo::String::From(pending_connects_.front().first),
37 mojo::ScopedMessagePipeHandle(pending_connects_.front().second)); 37 mojo::ScopedMessagePipeHandle(pending_connects_.front().second));
38 pending_connects_.pop(); 38 pending_connects_.pop();
39 } 39 }
40 } 40 }
41 41
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 95 }
96 96
97 it->second.Run(std::move(client_handle)); 97 it->second.Run(std::move(client_handle));
98 } 98 }
99 99
100 void ServiceRegistryImpl::OnConnectionError() { 100 void ServiceRegistryImpl::OnConnectionError() {
101 binding_.Close(); 101 binding_.Close();
102 } 102 }
103 103
104 } // namespace content 104 } // namespace content
OLDNEW
« no previous file with comments | « content/common/mojo/service_registry_impl.h ('k') | content/common/render_frame_setup.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698