diff options
Diffstat (limited to 'content/browser/android')
6 files changed, 7 insertions, 8 deletions
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc index 7c6407f..a83169c 100644 --- a/content/browser/android/content_settings.cc +++ b/content/browser/android/content_settings.cc @@ -42,7 +42,7 @@ bool ContentSettings::GetJavaScriptEnabled(JNIEnv* env, jobject obj) { return render_view_host->GetDelegate()->GetWebkitPrefs().javascript_enabled; } -void ContentSettings::WebContentsDestroyed(WebContents* web_contents) { +void ContentSettings::WebContentsDestroyed() { delete this; } diff --git a/content/browser/android/content_settings.h b/content/browser/android/content_settings.h index df75727..0728a6a 100644 --- a/content/browser/android/content_settings.h +++ b/content/browser/android/content_settings.h @@ -26,7 +26,7 @@ class ContentSettings : public WebContentsObserver { virtual ~ContentSettings(); // WebContentsObserver overrides: - virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; + virtual void WebContentsDestroyed() OVERRIDE; // The Java counterpart to this class. JavaObjectWeakGlobalRef content_settings_; diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 49fe629..85cd4fa 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -1676,9 +1676,9 @@ void ContentViewCoreImpl::OnSmartClipDataExtracted( env, obj.obj(), jresult.obj()); } -void ContentViewCoreImpl::WebContentsDestroyed(WebContents* web_contents) { +void ContentViewCoreImpl::WebContentsDestroyed() { WebContentsViewAndroid* wcva = static_cast<WebContentsViewAndroid*>( - static_cast<WebContentsImpl*>(web_contents)->GetView()); + static_cast<WebContentsImpl*>(web_contents())->GetView()); DCHECK(wcva); wcva->SetContentViewCore(NULL); } diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index 9f23c8e..a00b67f 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h @@ -319,7 +319,7 @@ class ContentViewCoreImpl : public ContentViewCore, // WebContentsObserver implementation. virtual void RenderViewReady() OVERRIDE; - virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; + virtual void WebContentsDestroyed() OVERRIDE; // -------------------------------------------------------------------------- // Other private methods and data diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc index db50efc..72b2241 100644 --- a/content/browser/android/web_contents_observer_android.cc +++ b/content/browser/android/web_contents_observer_android.cc @@ -48,8 +48,7 @@ void WebContentsObserverAndroid::Destroy(JNIEnv* env, jobject obj) { delete this; } -void WebContentsObserverAndroid::WebContentsDestroyed( - WebContents* web_contents) { +void WebContentsObserverAndroid::WebContentsDestroyed() { JNIEnv* env = AttachCurrentThread(); ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env)); if (obj.is_null()) { diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h index 0a4f874b..319436c 100644 --- a/content/browser/android/web_contents_observer_android.h +++ b/content/browser/android/web_contents_observer_android.h @@ -76,7 +76,7 @@ class WebContentsObserverAndroid : public WebContentsObserver { RenderViewHost* render_view_host) OVERRIDE; virtual void NavigationEntryCommitted( const LoadCommittedDetails& load_details) OVERRIDE; - virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; + virtual void WebContentsDestroyed() OVERRIDE; virtual void DidChangeVisibleSSLState() OVERRIDE; virtual void DidAttachInterstitialPage() OVERRIDE; virtual void DidDetachInterstitialPage() OVERRIDE; |