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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2692023002: Make PaymentRequestImpl work with RenderFrameHost (Closed)
Patch Set: Rebase after https://codereview.chromium.org/2708243004 Created 3 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/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
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 3347 matching lines...) Expand 10 before | Expand all | Expand 10 after
3472 RenderFrameHostImpl::GetJavaRenderFrameHost() { 3473 RenderFrameHostImpl::GetJavaRenderFrameHost() {
3473 RenderFrameHostAndroid* render_frame_host_android = 3474 RenderFrameHostAndroid* render_frame_host_android =
3474 static_cast<RenderFrameHostAndroid*>( 3475 static_cast<RenderFrameHostAndroid*>(
3475 GetUserData(kRenderFrameHostAndroidKey)); 3476 GetUserData(kRenderFrameHostAndroidKey));
3476 if (!render_frame_host_android) { 3477 if (!render_frame_host_android) {
3477 render_frame_host_android = new RenderFrameHostAndroid(this); 3478 render_frame_host_android = new RenderFrameHostAndroid(this);
3478 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); 3479 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android);
3479 } 3480 }
3480 return render_frame_host_android->GetJavaObject(); 3481 return render_frame_host_android->GetJavaObject();
3481 } 3482 }
3483
3484 service_manager::InterfaceProvider* RenderFrameHostImpl::GetJavaInterfaces() {
3485 if (!java_interfaces_) {
3486 service_manager::mojom::InterfaceProviderPtr provider;
3487 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3488 java_interfaces_.reset(new service_manager::InterfaceProvider);
3489 java_interfaces_->Bind(std::move(provider));
3490 }
3491 return java_interfaces_.get();
3492 }
3482 #endif 3493 #endif
3483 3494
3484 } // namespace content 3495 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698