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

Side by Side Diff: content/browser/frame_host/render_frame_host_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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after
2106 2106
2107 service_registry_.reset(new ServiceRegistryImpl()); 2107 service_registry_.reset(new ServiceRegistryImpl());
2108 if (!GetProcess()->GetServiceRegistry()) 2108 if (!GetProcess()->GetServiceRegistry())
2109 return; 2109 return;
2110 2110
2111 RegisterMojoServices(); 2111 RegisterMojoServices();
2112 RenderFrameSetupPtr setup; 2112 RenderFrameSetupPtr setup;
2113 GetProcess()->GetServiceRegistry()->ConnectToRemoteService( 2113 GetProcess()->GetServiceRegistry()->ConnectToRemoteService(
2114 mojo::GetProxy(&setup)); 2114 mojo::GetProxy(&setup));
2115 2115
2116 mojo::InterfaceProviderPtr exposed_services; 2116 mojo::shell::mojom::InterfaceProviderPtr exposed_services;
2117 service_registry_->Bind(GetProxy(&exposed_services)); 2117 service_registry_->Bind(GetProxy(&exposed_services));
2118 2118
2119 mojo::InterfaceProviderPtr services; 2119 mojo::shell::mojom::InterfaceProviderPtr services;
2120 setup->ExchangeInterfaceProviders(routing_id_, GetProxy(&services), 2120 setup->ExchangeInterfaceProviders(routing_id_, GetProxy(&services),
2121 std::move(exposed_services)); 2121 std::move(exposed_services));
2122 service_registry_->BindRemoteServiceProvider(std::move(services)); 2122 service_registry_->BindRemoteServiceProvider(std::move(services));
2123 2123
2124 #if defined(OS_ANDROID) 2124 #if defined(OS_ANDROID)
2125 service_registry_android_.reset( 2125 service_registry_android_.reset(
2126 new ServiceRegistryAndroid(service_registry_.get())); 2126 new ServiceRegistryAndroid(service_registry_.get()));
2127 ServiceRegistrarAndroid::RegisterFrameHostServices( 2127 ServiceRegistrarAndroid::RegisterFrameHostServices(
2128 service_registry_android_.get()); 2128 service_registry_android_.get());
2129 #endif 2129 #endif
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
2565 *dst = src; 2565 *dst = src;
2566 2566
2567 if (src.routing_id != -1) 2567 if (src.routing_id != -1)
2568 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2568 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2569 2569
2570 if (src.parent_routing_id != -1) 2570 if (src.parent_routing_id != -1)
2571 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2571 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2572 } 2572 }
2573 2573
2574 } // namespace content 2574 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_mojo_shell.cc ('k') | content/browser/mojo/mojo_app_connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698