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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2390013002: Rename mojo: to service: (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 | « components/leveldb/test_manifest.json ('k') | content/browser/mojo/mojo_shell_context.cc » ('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 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/command_line.h" 10 #include "base/command_line.h"
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 GetContentClient()->browser()->ExposeInterfacesToMediaService(registry.get(), 823 GetContentClient()->browser()->ExposeInterfacesToMediaService(registry.get(),
824 this); 824 this);
825 shell::mojom::InterfaceProviderPtr interfaces; 825 shell::mojom::InterfaceProviderPtr interfaces;
826 registry->Bind(GetProxy(&interfaces)); 826 registry->Bind(GetProxy(&interfaces));
827 media_registries_.push_back(std::move(registry)); 827 media_registries_.push_back(std::move(registry));
828 828
829 // TODO(slan): Use the BrowserContext Connector instead. See crbug.com/638950. 829 // TODO(slan): Use the BrowserContext Connector instead. See crbug.com/638950.
830 media::mojom::MediaServicePtr media_service; 830 media::mojom::MediaServicePtr media_service;
831 shell::Connector* connector = 831 shell::Connector* connector =
832 MojoShellConnection::GetForProcess()->GetConnector(); 832 MojoShellConnection::GetForProcess()->GetConnector();
833 connector->ConnectToInterface("mojo:media", &media_service); 833 connector->ConnectToInterface("service:media", &media_service);
834 media_service->CreateServiceFactory(std::move(request), 834 media_service->CreateServiceFactory(std::move(request),
835 std::move(interfaces)); 835 std::move(interfaces));
836 } 836 }
837 837
838 bool RenderFrameHostImpl::CreateRenderFrame(int proxy_routing_id, 838 bool RenderFrameHostImpl::CreateRenderFrame(int proxy_routing_id,
839 int opener_routing_id, 839 int opener_routing_id,
840 int parent_routing_id, 840 int parent_routing_id,
841 int previous_sibling_routing_id) { 841 int previous_sibling_routing_id) {
842 TRACE_EVENT0("navigation", "RenderFrameHostImpl::CreateRenderFrame"); 842 TRACE_EVENT0("navigation", "RenderFrameHostImpl::CreateRenderFrame");
843 DCHECK(!IsRenderFrameLive()) << "Creating frame twice"; 843 DCHECK(!IsRenderFrameLive()) << "Creating frame twice";
(...skipping 2267 matching lines...) Expand 10 before | Expand all | Expand 10 after
3111 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3111 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3112 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3112 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3113 return web_bluetooth_service_.get(); 3113 return web_bluetooth_service_.get();
3114 } 3114 }
3115 3115
3116 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3116 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3117 web_bluetooth_service_.reset(); 3117 web_bluetooth_service_.reset();
3118 } 3118 }
3119 3119
3120 } // namespace content 3120 } // namespace content
OLDNEW
« no previous file with comments | « components/leveldb/test_manifest.json ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698