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

Side by Side Diff: content/browser/web_contents/web_contents_android.cc

Issue 2671623002: Expose WindowAndroid from WebContents. (Closed)
Patch Set: Rebase 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/web_contents/web_contents_android.h" 5 #include "content/browser/web_contents/web_contents_android.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/public/browser/browser_context.h" 32 #include "content/public/browser/browser_context.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "content/public/browser/message_port_provider.h" 34 #include "content/public/browser/message_port_provider.h"
35 #include "content/public/browser/render_widget_host.h" 35 #include "content/public/browser/render_widget_host.h"
36 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 #include "content/public/common/content_switches.h" 37 #include "content/public/common/content_switches.h"
38 #include "jni/WebContentsImpl_jni.h" 38 #include "jni/WebContentsImpl_jni.h"
39 #include "net/android/network_library.h" 39 #include "net/android/network_library.h"
40 #include "ui/accessibility/ax_node_data.h" 40 #include "ui/accessibility/ax_node_data.h"
41 #include "ui/android/overscroll_refresh_handler.h" 41 #include "ui/android/overscroll_refresh_handler.h"
42 #include "ui/android/window_android.h"
42 #include "ui/gfx/android/java_bitmap.h" 43 #include "ui/gfx/android/java_bitmap.h"
43 #include "ui/gfx/geometry/rect.h" 44 #include "ui/gfx/geometry/rect.h"
44 45
45 using base::android::AttachCurrentThread; 46 using base::android::AttachCurrentThread;
46 using base::android::ConvertJavaStringToUTF8; 47 using base::android::ConvertJavaStringToUTF8;
47 using base::android::ConvertJavaStringToUTF16; 48 using base::android::ConvertJavaStringToUTF16;
48 using base::android::ConvertUTF8ToJavaString; 49 using base::android::ConvertUTF8ToJavaString;
49 using base::android::ConvertUTF16ToJavaString; 50 using base::android::ConvertUTF16ToJavaString;
50 using base::android::JavaParamRef; 51 using base::android::JavaParamRef;
51 using base::android::JavaRef; 52 using base::android::JavaRef;
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 g_allocated_web_contents_androids.Get().end()); 278 g_allocated_web_contents_androids.Get().end());
278 g_allocated_web_contents_androids.Get().erase(this); 279 g_allocated_web_contents_androids.Get().erase(this);
279 Java_WebContentsImpl_clearNativePtr(AttachCurrentThread(), obj_); 280 Java_WebContentsImpl_clearNativePtr(AttachCurrentThread(), obj_);
280 } 281 }
281 282
282 base::android::ScopedJavaLocalRef<jobject> 283 base::android::ScopedJavaLocalRef<jobject>
283 WebContentsAndroid::GetJavaObject() { 284 WebContentsAndroid::GetJavaObject() {
284 return base::android::ScopedJavaLocalRef<jobject>(obj_); 285 return base::android::ScopedJavaLocalRef<jobject>(obj_);
285 } 286 }
286 287
288 base::android::ScopedJavaLocalRef<jobject>
289 WebContentsAndroid::GetTopLevelNativeWindow(JNIEnv* env,
290 const JavaParamRef<jobject>& obj) {
291 ui::WindowAndroid* window_android = web_contents_->GetTopLevelNativeWindow();
292 if (!window_android)
293 return nullptr;
294 return window_android->GetJavaObject();
295 }
296
287 ScopedJavaLocalRef<jstring> WebContentsAndroid::GetTitle( 297 ScopedJavaLocalRef<jstring> WebContentsAndroid::GetTitle(
288 JNIEnv* env, 298 JNIEnv* env,
289 const JavaParamRef<jobject>& obj) const { 299 const JavaParamRef<jobject>& obj) const {
290 return base::android::ConvertUTF16ToJavaString(env, 300 return base::android::ConvertUTF16ToJavaString(env,
291 web_contents_->GetTitle()); 301 web_contents_->GetTitle());
292 } 302 }
293 303
294 ScopedJavaLocalRef<jstring> WebContentsAndroid::GetVisibleURL( 304 ScopedJavaLocalRef<jstring> WebContentsAndroid::GetVisibleURL(
295 JNIEnv* env, 305 JNIEnv* env,
296 const JavaParamRef<jobject>& obj) const { 306 const JavaParamRef<jobject>& obj) const {
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 env, obj, callback, id, http_status_code, jurl, jbitmaps, jsizes); 770 env, obj, callback, id, http_status_code, jurl, jbitmaps, jsizes);
761 } 771 }
762 772
763 void WebContentsAndroid::SetMediaSession( 773 void WebContentsAndroid::SetMediaSession(
764 const ScopedJavaLocalRef<jobject>& j_media_session) { 774 const ScopedJavaLocalRef<jobject>& j_media_session) {
765 JNIEnv* env = base::android::AttachCurrentThread(); 775 JNIEnv* env = base::android::AttachCurrentThread();
766 Java_WebContentsImpl_setMediaSession(env, obj_, j_media_session); 776 Java_WebContentsImpl_setMediaSession(env, obj_, j_media_session);
767 } 777 }
768 778
769 } // namespace content 779 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698