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

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

Issue 2692023002: Make PaymentRequestImpl work with RenderFrameHost (Closed)
Patch Set: Address review comment 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
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #include "mojo/public/cpp/bindings/strong_binding.h" 107 #include "mojo/public/cpp/bindings/strong_binding.h"
108 #include "services/service_manager/public/cpp/connector.h" 108 #include "services/service_manager/public/cpp/connector.h"
109 #include "services/service_manager/public/cpp/interface_provider.h" 109 #include "services/service_manager/public/cpp/interface_provider.h"
110 #include "ui/accessibility/ax_tree.h" 110 #include "ui/accessibility/ax_tree.h"
111 #include "ui/accessibility/ax_tree_id_registry.h" 111 #include "ui/accessibility/ax_tree_id_registry.h"
112 #include "ui/accessibility/ax_tree_update.h" 112 #include "ui/accessibility/ax_tree_update.h"
113 #include "ui/gfx/geometry/quad_f.h" 113 #include "ui/gfx/geometry/quad_f.h"
114 #include "url/gurl.h" 114 #include "url/gurl.h"
115 115
116 #if defined(OS_ANDROID) 116 #if defined(OS_ANDROID)
117 #include "content/browser/android/java_interfaces_impl.h"
117 #include "content/browser/frame_host/render_frame_host_android.h" 118 #include "content/browser/frame_host/render_frame_host_android.h"
118 #include "content/browser/media/android/media_player_renderer.h" 119 #include "content/browser/media/android/media_player_renderer.h"
119 #include "content/public/browser/android/java_interfaces.h" 120 #include "content/public/browser/android/java_interfaces.h"
120 #include "media/base/audio_renderer_sink.h" 121 #include "media/base/audio_renderer_sink.h"
121 #include "media/base/video_renderer_sink.h" 122 #include "media/base/video_renderer_sink.h"
122 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck 123 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck
123 #endif 124 #endif
124 125
125 #if defined(OS_MACOSX) 126 #if defined(OS_MACOSX)
126 #include "content/browser/frame_host/popup_menu_helper_mac.h" 127 #include "content/browser/frame_host/popup_menu_helper_mac.h"
(...skipping 3368 matching lines...) Expand 10 before | Expand all | Expand 10 after
3495 RenderFrameHostImpl::GetJavaRenderFrameHost() { 3496 RenderFrameHostImpl::GetJavaRenderFrameHost() {
3496 RenderFrameHostAndroid* render_frame_host_android = 3497 RenderFrameHostAndroid* render_frame_host_android =
3497 static_cast<RenderFrameHostAndroid*>( 3498 static_cast<RenderFrameHostAndroid*>(
3498 GetUserData(kRenderFrameHostAndroidKey)); 3499 GetUserData(kRenderFrameHostAndroidKey));
3499 if (!render_frame_host_android) { 3500 if (!render_frame_host_android) {
3500 render_frame_host_android = new RenderFrameHostAndroid(this); 3501 render_frame_host_android = new RenderFrameHostAndroid(this);
3501 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); 3502 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android);
3502 } 3503 }
3503 return render_frame_host_android->GetJavaObject(); 3504 return render_frame_host_android->GetJavaObject();
3504 } 3505 }
3506
3507 service_manager::InterfaceProvider* RenderFrameHostImpl::GetJavaInterfaces() {
3508 if (!java_interfaces_) {
3509 service_manager::mojom::InterfaceProviderPtr provider;
3510 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3511 java_interfaces_.reset(new service_manager::InterfaceProvider);
3512 java_interfaces_->Bind(std::move(provider));
3513 }
3514 return java_interfaces_.get();
3515 }
3505 #endif 3516 #endif
3506 3517
3507 } // namespace content 3518 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698