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

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

Issue 2681933002: Add Java wrapper for RenderFrameHost (Closed)
Patch Set: s/GetURL/GetLastCommittedURL/g Created 3 years, 10 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 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_update.h" 111 #include "ui/accessibility/ax_tree_update.h"
112 #include "ui/gfx/geometry/quad_f.h" 112 #include "ui/gfx/geometry/quad_f.h"
113 #include "url/gurl.h" 113 #include "url/gurl.h"
114 114
115 #if defined(OS_ANDROID) 115 #if defined(OS_ANDROID)
116 #include "content/browser/android/app_web_message_port_message_filter.h" 116 #include "content/browser/android/app_web_message_port_message_filter.h"
117 #include "content/browser/frame_host/render_frame_host_android.h"
118 #include "content/browser/media/android/media_player_renderer.h"
117 #include "content/public/browser/android/java_interfaces.h" 119 #include "content/public/browser/android/java_interfaces.h"
118 #include "content/browser/media/android/media_player_renderer.h"
119 #include "media/base/audio_renderer_sink.h" 120 #include "media/base/audio_renderer_sink.h"
120 #include "media/base/video_renderer_sink.h" 121 #include "media/base/video_renderer_sink.h"
121 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck 122 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck
122 #endif 123 #endif
123 124
124 #if defined(OS_MACOSX) 125 #if defined(OS_MACOSX)
125 #include "content/browser/frame_host/popup_menu_helper_mac.h" 126 #include "content/browser/frame_host/popup_menu_helper_mac.h"
126 #endif 127 #endif
127 128
128 #if defined(ENABLE_WEBVR) 129 #if defined(ENABLE_WEBVR)
129 #include "device/vr/vr_service_impl.h" // nogncheck 130 #include "device/vr/vr_service_impl.h" // nogncheck
130 #else 131 #else
131 #include "device/vr/vr_service.mojom.h" // nogncheck 132 #include "device/vr/vr_service.mojom.h" // nogncheck
132 #endif 133 #endif
133 134
135 #if defined(OS_ANDROID)
136 const char kRenderFrameHostAndroidKey[] = "render_frame_host_android";
137 #endif // OS_ANDROID
138
134 using base::TimeDelta; 139 using base::TimeDelta;
135 140
136 namespace content { 141 namespace content {
137 142
138 namespace { 143 namespace {
139 144
140 // The next value to use for the accessibility reset token. 145 // The next value to use for the accessibility reset token.
141 int g_next_accessibility_reset_token = 1; 146 int g_next_accessibility_reset_token = 1;
142 147
143 // The next value to use for the javascript callback id. 148 // The next value to use for the javascript callback id.
(...skipping 3361 matching lines...) Expand 10 before | Expand all | Expand 10 after
3505 3510
3506 // There is no pending NavigationEntry in these cases, so pass 0 as the 3511 // There is no pending NavigationEntry in these cases, so pass 0 as the
3507 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3512 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3508 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3513 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3509 return NavigationHandleImpl::Create( 3514 return NavigationHandleImpl::Create(
3510 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, 3515 params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
3511 params.was_within_same_page, base::TimeTicks::Now(), 3516 params.was_within_same_page, base::TimeTicks::Now(),
3512 entry_id_for_data_nav, false); // started_from_context_menu 3517 entry_id_for_data_nav, false); // started_from_context_menu
3513 } 3518 }
3514 3519
3520 #if defined(OS_ANDROID)
3521 base::android::ScopedJavaLocalRef<jobject>
3522 RenderFrameHostImpl::GetJavaRenderFrameHost() {
3523 RenderFrameHostAndroid* render_frame_host_android =
3524 static_cast<RenderFrameHostAndroid*>(
3525 GetUserData(kRenderFrameHostAndroidKey));
3526 if (!render_frame_host_android) {
3527 render_frame_host_android = new RenderFrameHostAndroid(this);
3528 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android);
3529 }
3530 return render_frame_host_android->GetJavaObject();
3531 }
3532 #endif
3533
3515 } // namespace content 3534 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698