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/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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 #include "services/service_manager/public/cpp/interface_provider.h" | 103 #include "services/service_manager/public/cpp/interface_provider.h" |
104 #include "third_party/WebKit/public/platform/modules/shapedetection/shapedetecti
on.mojom.h" | 104 #include "third_party/WebKit/public/platform/modules/shapedetection/shapedetecti
on.mojom.h" |
105 #include "ui/accessibility/ax_tree.h" | 105 #include "ui/accessibility/ax_tree.h" |
106 #include "ui/accessibility/ax_tree_update.h" | 106 #include "ui/accessibility/ax_tree_update.h" |
107 #include "ui/gfx/geometry/quad_f.h" | 107 #include "ui/gfx/geometry/quad_f.h" |
108 #include "url/gurl.h" | 108 #include "url/gurl.h" |
109 | 109 |
110 #if defined(OS_ANDROID) | 110 #if defined(OS_ANDROID) |
111 #include "content/browser/android/app_web_message_port_message_filter.h" | 111 #include "content/browser/android/app_web_message_port_message_filter.h" |
112 #include "content/public/browser/android/java_interfaces.h" | 112 #include "content/public/browser/android/java_interfaces.h" |
113 #if defined(ENABLE_MOJO_CDM) | |
114 #include "content/browser/media/android/provision_fetcher_impl.h" | |
115 #endif | |
116 #include "content/browser/media/android/media_player_renderer.h" | 113 #include "content/browser/media/android/media_player_renderer.h" |
117 #include "media/base/audio_renderer_sink.h" | 114 #include "media/base/audio_renderer_sink.h" |
118 #include "media/base/video_renderer_sink.h" | 115 #include "media/base/video_renderer_sink.h" |
119 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck | 116 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck |
120 #endif | 117 #endif |
121 | 118 |
122 #if defined(OS_MACOSX) | 119 #if defined(OS_MACOSX) |
123 #include "content/browser/frame_host/popup_menu_helper_mac.h" | 120 #include "content/browser/frame_host/popup_menu_helper_mac.h" |
124 #endif | 121 #endif |
125 | 122 |
| 123 #if defined(ENABLE_MOJO_CDM) |
| 124 #include "content/public/browser/provision_fetcher_impl.h" |
| 125 #endif |
| 126 |
126 #if defined(ENABLE_WEBVR) | 127 #if defined(ENABLE_WEBVR) |
127 #include "device/vr/vr_service_impl.h" // nogncheck | 128 #include "device/vr/vr_service_impl.h" // nogncheck |
128 #endif | 129 #endif |
129 | 130 |
130 using base::TimeDelta; | 131 using base::TimeDelta; |
131 | 132 |
132 namespace content { | 133 namespace content { |
133 | 134 |
134 namespace { | 135 namespace { |
135 | 136 |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
807 // Any future UpdateState or UpdateTitle messages from this or a recreated | 808 // Any future UpdateState or UpdateTitle messages from this or a recreated |
808 // process should be ignored until the next commit. | 809 // process should be ignored until the next commit. |
809 set_nav_entry_id(0); | 810 set_nav_entry_id(0); |
810 } | 811 } |
811 | 812 |
812 void RenderFrameHostImpl::Create( | 813 void RenderFrameHostImpl::Create( |
813 const service_manager::Identity& remote_identity, | 814 const service_manager::Identity& remote_identity, |
814 media::mojom::InterfaceFactoryRequest request) { | 815 media::mojom::InterfaceFactoryRequest request) { |
815 auto registry = base::MakeUnique<service_manager::InterfaceRegistry>( | 816 auto registry = base::MakeUnique<service_manager::InterfaceRegistry>( |
816 std::string()); | 817 std::string()); |
817 #if defined(OS_ANDROID) && defined(ENABLE_MOJO_CDM) | 818 #if defined(ENABLE_MOJO_CDM) |
| 819 net::URLRequestContextGetter* context_getter = |
| 820 BrowserContext::GetDefaultStoragePartition( |
| 821 GetProcess()->GetBrowserContext()) |
| 822 ->GetURLRequestContext(); |
818 registry->AddInterface( | 823 registry->AddInterface( |
819 base::Bind(&ProvisionFetcherImpl::Create, this)); | 824 base::Bind(&ProvisionFetcherImpl::Create, context_getter)); |
820 #endif | 825 #endif // defined(ENABLE_MOJO_CDM) |
821 GetContentClient()->browser()->ExposeInterfacesToMediaService(registry.get(), | 826 GetContentClient()->browser()->ExposeInterfacesToMediaService(registry.get(), |
822 this); | 827 this); |
823 service_manager::mojom::InterfaceProviderPtr interfaces; | 828 service_manager::mojom::InterfaceProviderPtr interfaces; |
824 registry->Bind(GetProxy(&interfaces), | 829 registry->Bind(GetProxy(&interfaces), |
825 service_manager::Identity(), | 830 service_manager::Identity(), |
826 service_manager::InterfaceProviderSpec(), | 831 service_manager::InterfaceProviderSpec(), |
827 service_manager::Identity(), | 832 service_manager::Identity(), |
828 service_manager::InterfaceProviderSpec()); | 833 service_manager::InterfaceProviderSpec()); |
829 media_registries_.push_back(std::move(registry)); | 834 media_registries_.push_back(std::move(registry)); |
830 | 835 |
(...skipping 2348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3179 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3184 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
3180 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3185 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
3181 return web_bluetooth_service_.get(); | 3186 return web_bluetooth_service_.get(); |
3182 } | 3187 } |
3183 | 3188 |
3184 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3189 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
3185 web_bluetooth_service_.reset(); | 3190 web_bluetooth_service_.reset(); |
3186 } | 3191 } |
3187 | 3192 |
3188 } // namespace content | 3193 } // namespace content |
OLD | NEW |