OLD | NEW |
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 5886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5897 if (!media_session_manager_) | 5897 if (!media_session_manager_) |
5898 media_session_manager_ = new RendererMediaSessionManager(this); | 5898 media_session_manager_ = new RendererMediaSessionManager(this); |
5899 return media_session_manager_; | 5899 return media_session_manager_; |
5900 } | 5900 } |
5901 | 5901 |
5902 #endif // defined(OS_ANDROID) | 5902 #endif // defined(OS_ANDROID) |
5903 | 5903 |
5904 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { | 5904 media::MediaPermission* RenderFrameImpl::GetMediaPermission() { |
5905 if (!media_permission_dispatcher_) { | 5905 if (!media_permission_dispatcher_) { |
5906 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind( | 5906 media_permission_dispatcher_.reset(new MediaPermissionDispatcher(base::Bind( |
5907 &RenderFrameImpl::GetInterface<blink::mojom::PermissionService>, | 5907 &RenderFrameImpl::GetInterface<permissions::mojom::PermissionService>, |
5908 base::Unretained(this)))); | 5908 base::Unretained(this)))); |
5909 } | 5909 } |
5910 return media_permission_dispatcher_.get(); | 5910 return media_permission_dispatcher_.get(); |
5911 } | 5911 } |
5912 | 5912 |
5913 #if defined(ENABLE_MOJO_MEDIA) | 5913 #if defined(ENABLE_MOJO_MEDIA) |
5914 shell::mojom::InterfaceProvider* RenderFrameImpl::GetMediaInterfaceProvider() { | 5914 shell::mojom::InterfaceProvider* RenderFrameImpl::GetMediaInterfaceProvider() { |
5915 if (!media_interface_provider_) { | 5915 if (!media_interface_provider_) { |
5916 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( | 5916 media_interface_provider_.reset(new MediaInterfaceProvider(base::Bind( |
5917 &RenderFrameImpl::ConnectToApplication, base::Unretained(this)))); | 5917 &RenderFrameImpl::ConnectToApplication, base::Unretained(this)))); |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6033 int match_count, | 6033 int match_count, |
6034 int ordinal, | 6034 int ordinal, |
6035 const WebRect& selection_rect, | 6035 const WebRect& selection_rect, |
6036 bool final_status_update) { | 6036 bool final_status_update) { |
6037 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6037 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6038 selection_rect, ordinal, | 6038 selection_rect, ordinal, |
6039 final_status_update)); | 6039 final_status_update)); |
6040 } | 6040 } |
6041 | 6041 |
6042 } // namespace content | 6042 } // namespace content |
OLD | NEW |