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 <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 #include "mojo/public/cpp/bindings/strong_binding.h" | 105 #include "mojo/public/cpp/bindings/strong_binding.h" |
106 #include "services/service_manager/public/cpp/connector.h" | 106 #include "services/service_manager/public/cpp/connector.h" |
107 #include "services/service_manager/public/cpp/interface_provider.h" | 107 #include "services/service_manager/public/cpp/interface_provider.h" |
108 #include "ui/accessibility/ax_tree.h" | 108 #include "ui/accessibility/ax_tree.h" |
109 #include "ui/accessibility/ax_tree_id_registry.h" | 109 #include "ui/accessibility/ax_tree_id_registry.h" |
110 #include "ui/accessibility/ax_tree_update.h" | 110 #include "ui/accessibility/ax_tree_update.h" |
111 #include "ui/gfx/geometry/quad_f.h" | 111 #include "ui/gfx/geometry/quad_f.h" |
112 #include "url/gurl.h" | 112 #include "url/gurl.h" |
113 | 113 |
114 #if defined(OS_ANDROID) | 114 #if defined(OS_ANDROID) |
| 115 #include "content/browser/android/java_interfaces_impl.h" |
115 #include "content/browser/frame_host/render_frame_host_android.h" | 116 #include "content/browser/frame_host/render_frame_host_android.h" |
116 #include "content/browser/media/android/media_player_renderer.h" | 117 #include "content/browser/media/android/media_player_renderer.h" |
117 #include "content/public/browser/android/java_interfaces.h" | 118 #include "content/public/browser/android/java_interfaces.h" |
118 #include "media/base/audio_renderer_sink.h" | 119 #include "media/base/audio_renderer_sink.h" |
119 #include "media/base/video_renderer_sink.h" | 120 #include "media/base/video_renderer_sink.h" |
120 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck | 121 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck |
121 #endif | 122 #endif |
122 | 123 |
123 #if defined(OS_MACOSX) | 124 #if defined(OS_MACOSX) |
124 #include "content/browser/frame_host/popup_menu_helper_mac.h" | 125 #include "content/browser/frame_host/popup_menu_helper_mac.h" |
(...skipping 3352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3477 RenderFrameHostImpl::GetJavaRenderFrameHost() { | 3478 RenderFrameHostImpl::GetJavaRenderFrameHost() { |
3478 RenderFrameHostAndroid* render_frame_host_android = | 3479 RenderFrameHostAndroid* render_frame_host_android = |
3479 static_cast<RenderFrameHostAndroid*>( | 3480 static_cast<RenderFrameHostAndroid*>( |
3480 GetUserData(kRenderFrameHostAndroidKey)); | 3481 GetUserData(kRenderFrameHostAndroidKey)); |
3481 if (!render_frame_host_android) { | 3482 if (!render_frame_host_android) { |
3482 render_frame_host_android = new RenderFrameHostAndroid(this); | 3483 render_frame_host_android = new RenderFrameHostAndroid(this); |
3483 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); | 3484 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); |
3484 } | 3485 } |
3485 return render_frame_host_android->GetJavaObject(); | 3486 return render_frame_host_android->GetJavaObject(); |
3486 } | 3487 } |
| 3488 |
| 3489 service_manager::InterfaceProvider* RenderFrameHostImpl::GetJavaInterfaces() { |
| 3490 if (!java_interfaces_) { |
| 3491 service_manager::mojom::InterfaceProviderPtr provider; |
| 3492 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); |
| 3493 java_interfaces_.reset(new service_manager::InterfaceProvider); |
| 3494 java_interfaces_->Bind(std::move(provider)); |
| 3495 } |
| 3496 return java_interfaces_.get(); |
| 3497 } |
3487 #endif | 3498 #endif |
3488 | 3499 |
3489 } // namespace content | 3500 } // namespace content |
OLD | NEW |