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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 5988 matching lines...) Expand 10 before | Expand all | Expand 10 after
5999 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() { 5999 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
6000 if (!media_session_manager_) 6000 if (!media_session_manager_)
6001 media_session_manager_ = new RendererMediaSessionManager(this); 6001 media_session_manager_ = new RendererMediaSessionManager(this);
6002 return media_session_manager_; 6002 return media_session_manager_;
6003 } 6003 }
6004 6004
6005 #endif // defined(OS_ANDROID) 6005 #endif // defined(OS_ANDROID)
6006 6006
6007 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { 6007 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
6008 if (!media_permission_dispatcher_) { 6008 if (!media_permission_dispatcher_) {
6009 media_permission_dispatcher_.reset(new MediaPermissionDispatcher( 6009 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
6010 base::Bind(&RenderFrameImpl::GetInterface<PermissionService>, 6010 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>,
6011 base::Unretained(this)))); 6011 base::Unretained(this))));
6012 } 6012 }
6013 return media_permission_dispatcher_.get(); 6013 return media_permission_dispatcher_.get();
6014 } 6014 }
6015 6015
6016 #if defined(ENABLE_MOJO_MEDIA) 6016 #if defined(ENABLE_MOJO_MEDIA)
6017 mojo::shell::mojom::InterfaceProvider* 6017 mojo::shell::mojom::InterfaceProvider*
6018 RenderFrameImpl::GetMediaInterfaceProvider() { 6018 RenderFrameImpl::GetMediaInterfaceProvider() {
6019 if (!media_interface_provider_) { 6019 if (!media_interface_provider_) {
6020 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( 6020 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind(
6021 &RenderFrameImpl::ConnectToApplication, base::Unretained(this)))); 6021 &RenderFrameImpl::ConnectToApplication, base::Unretained(this))));
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
6133 int match_count, 6133 int match_count,
6134 int ordinal, 6134 int ordinal,
6135 const WebRect& selection_rect, 6135 const WebRect& selection_rect,
6136 bool final_status_update) { 6136 bool final_status_update) {
6137 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6137 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6138 selection_rect, ordinal, 6138 selection_rect, ordinal,
6139 final_status_update)); 6139 final_status_update));
6140 } 6140 }
6141 6141
6142 } // namespace content 6142 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698