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

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: rebase 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 5940 matching lines...) Expand 10 before | Expand all | Expand 10 after
5951 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() { 5951 RendererMediaSessionManager* RenderFrameImpl::GetMediaSessionManager() {
5952 if (!media_session_manager_) 5952 if (!media_session_manager_)
5953 media_session_manager_ = new RendererMediaSessionManager(this); 5953 media_session_manager_ = new RendererMediaSessionManager(this);
5954 return media_session_manager_; 5954 return media_session_manager_;
5955 } 5955 }
5956 5956
5957 #endif // defined(OS_ANDROID) 5957 #endif // defined(OS_ANDROID)
5958 5958
5959 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { 5959 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
5960 if (!media_permission_dispatcher_) { 5960 if (!media_permission_dispatcher_) {
5961 media_permission_dispatcher_.reset(new MediaPermissionDispatcher( 5961 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
5962 base::Bind(&RenderFrameImpl::GetInterface<PermissionService>, 5962 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>,
5963 base::Unretained(this)))); 5963 base::Unretained(this))));
5964 } 5964 }
5965 return media_permission_dispatcher_.get(); 5965 return media_permission_dispatcher_.get();
5966 } 5966 }
5967 5967
5968 #if defined(ENABLE_MOJO_MEDIA) 5968 #if defined(ENABLE_MOJO_MEDIA)
5969 mojo::shell::mojom::InterfaceProvider* 5969 mojo::shell::mojom::InterfaceProvider*
5970 RenderFrameImpl::GetMediaInterfaceProvider() { 5970 RenderFrameImpl::GetMediaInterfaceProvider() {
5971 if (!media_interface_provider_) { 5971 if (!media_interface_provider_) {
5972 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( 5972 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind(
5973 &RenderFrameImpl::ConnectToApplication, base::Unretained(this)))); 5973 &RenderFrameImpl::ConnectToApplication, base::Unretained(this))));
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
6085 int match_count, 6085 int match_count,
6086 int ordinal, 6086 int ordinal,
6087 const WebRect& selection_rect, 6087 const WebRect& selection_rect,
6088 bool final_status_update) { 6088 bool final_status_update) {
6089 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6089 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6090 selection_rect, ordinal, 6090 selection_rect, ordinal,
6091 final_status_update)); 6091 final_status_update));
6092 } 6092 }
6093 6093
6094 } // namespace content 6094 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698