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

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

Issue 1921553003: Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 5902 matching lines...) Expand 10 before | Expand all | Expand 10 after
5913 if (!media_session_manager_) 5913 if (!media_session_manager_)
5914 media_session_manager_ = new RendererMediaSessionManager(this); 5914 media_session_manager_ = new RendererMediaSessionManager(this);
5915 return media_session_manager_; 5915 return media_session_manager_;
5916 } 5916 }
5917 5917
5918 #endif // defined(OS_ANDROID) 5918 #endif // defined(OS_ANDROID)
5919 5919
5920 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { 5920 media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
5921 if (!media_permission_dispatcher_) { 5921 if (!media_permission_dispatcher_) {
5922 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind( 5922 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind(
5923 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>, 5923 &RenderFrameImpl::GetInterface<permission::mojom::PermissionService>,
5924 base::Unretained(this)))); 5924 base::Unretained(this))));
5925 } 5925 }
5926 return media_permission_dispatcher_.get(); 5926 return media_permission_dispatcher_.get();
5927 } 5927 }
5928 5928
5929 #if defined(ENABLE_MOJO_MEDIA) 5929 #if defined(ENABLE_MOJO_MEDIA)
5930 shell::mojom::InterfaceProvider* RenderFrameImpl::GetMediaInterfaceProvider() { 5930 shell::mojom::InterfaceProvider* RenderFrameImpl::GetMediaInterfaceProvider() {
5931 if (!media_interface_provider_) { 5931 if (!media_interface_provider_) {
5932 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( 5932 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind(
5933 &RenderFrameImpl::ConnectToApplication, base::Unretained(this)))); 5933 &RenderFrameImpl::ConnectToApplication, base::Unretained(this))));
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
6049 int match_count, 6049 int match_count,
6050 int ordinal, 6050 int ordinal,
6051 const WebRect& selection_rect, 6051 const WebRect& selection_rect,
6052 bool final_status_update) { 6052 bool final_status_update) {
6053 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6053 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6054 selection_rect, ordinal, 6054 selection_rect, ordinal,
6055 final_status_update)); 6055 final_status_update));
6056 } 6056 }
6057 6057
6058 } // namespace content 6058 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698