| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "chrome/browser/android/tab_android.h" | 5 #include "chrome/browser/android/tab_android.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 void TabAndroid::AttachTabHelpers(content::WebContents* web_contents) { | 119 void TabAndroid::AttachTabHelpers(content::WebContents* web_contents) { |
| 120 DCHECK(web_contents); | 120 DCHECK(web_contents); |
| 121 | 121 |
| 122 TabHelpers::AttachTabHelpers(web_contents); | 122 TabHelpers::AttachTabHelpers(web_contents); |
| 123 } | 123 } |
| 124 | 124 |
| 125 TabAndroid::TabAndroid(JNIEnv* env, const JavaRef<jobject>& obj) | 125 TabAndroid::TabAndroid(JNIEnv* env, const JavaRef<jobject>& obj) |
| 126 : weak_java_tab_(env, obj), | 126 : weak_java_tab_(env, obj), |
| 127 content_layer_(cc::Layer::Create()), | 127 content_layer_(cc::Layer::Create()), |
| 128 tab_content_manager_(NULL), | 128 tab_content_manager_(NULL), |
| 129 synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) { | 129 synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)), |
| 130 embedded_media_experience_enabled_(false) { |
| 130 Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this)); | 131 Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this)); |
| 131 } | 132 } |
| 132 | 133 |
| 133 TabAndroid::~TabAndroid() { | 134 TabAndroid::~TabAndroid() { |
| 134 GetContentLayer()->RemoveAllChildren(); | 135 GetContentLayer()->RemoveAllChildren(); |
| 135 JNIEnv* env = base::android::AttachCurrentThread(); | 136 JNIEnv* env = base::android::AttachCurrentThread(); |
| 136 Java_Tab_clearNativePtr(env, weak_java_tab_.get(env)); | 137 Java_Tab_clearNativePtr(env, weak_java_tab_.get(env)); |
| 137 } | 138 } |
| 138 | 139 |
| 139 base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() { | 140 base::android::ScopedJavaLocalRef<jobject> TabAndroid::GetJavaObject() { |
| (...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 env, *offline_page); | 710 env, *offline_page); |
| 710 } | 711 } |
| 711 | 712 |
| 712 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env, | 713 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env, |
| 713 const JavaParamRef<jobject>& obj, | 714 const JavaParamRef<jobject>& obj, |
| 714 const JavaParamRef<jstring>& url) { | 715 const JavaParamRef<jstring>& url) { |
| 715 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); | 716 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); |
| 716 return HasPrerenderedUrl(gurl); | 717 return HasPrerenderedUrl(gurl); |
| 717 } | 718 } |
| 718 | 719 |
| 720 void TabAndroid::EnableEmbeddedMediaExperience( |
| 721 JNIEnv* env, |
| 722 const base::android::JavaParamRef<jobject>& obj, |
| 723 jboolean enabled) { |
| 724 embedded_media_experience_enabled_ = enabled; |
| 725 |
| 726 if (!web_contents() || !web_contents()->GetRenderViewHost()) |
| 727 return; |
| 728 |
| 729 web_contents()->GetRenderViewHost()->OnWebkitPreferencesChanged(); |
| 730 } |
| 731 |
| 732 bool TabAndroid::ShouldEnableEmbeddedMediaExperience() const { |
| 733 return embedded_media_experience_enabled_; |
| 734 } |
| 735 |
| 719 namespace { | 736 namespace { |
| 720 | 737 |
| 721 class ChromeInterceptNavigationDelegate : public InterceptNavigationDelegate { | 738 class ChromeInterceptNavigationDelegate : public InterceptNavigationDelegate { |
| 722 public: | 739 public: |
| 723 ChromeInterceptNavigationDelegate(JNIEnv* env, jobject jdelegate) | 740 ChromeInterceptNavigationDelegate(JNIEnv* env, jobject jdelegate) |
| 724 : InterceptNavigationDelegate(env, jdelegate) {} | 741 : InterceptNavigationDelegate(env, jdelegate) {} |
| 725 | 742 |
| 726 bool ShouldIgnoreNavigation( | 743 bool ShouldIgnoreNavigation( |
| 727 const NavigationParams& navigation_params) override { | 744 const NavigationParams& navigation_params) override { |
| 728 NavigationParams chrome_navigation_params(navigation_params); | 745 NavigationParams chrome_navigation_params(navigation_params); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 792 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 776 TRACE_EVENT0("native", "TabAndroid::Init"); | 793 TRACE_EVENT0("native", "TabAndroid::Init"); |
| 777 // This will automatically bind to the Java object and pass ownership there. | 794 // This will automatically bind to the Java object and pass ownership there. |
| 778 new TabAndroid(env, obj); | 795 new TabAndroid(env, obj); |
| 779 } | 796 } |
| 780 | 797 |
| 781 // static | 798 // static |
| 782 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { | 799 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { |
| 783 return RegisterNativesImpl(env); | 800 return RegisterNativesImpl(env); |
| 784 } | 801 } |
| OLD | NEW |