summaryrefslogtreecommitdiffstats
path: root/content/browser/android
diff options
context:
space:
mode:
authorsimonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 17:49:10 +0000
committersimonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-10 17:49:10 +0000
commitb342991cd48d105202b5066ba2e092589ba1418c (patch)
treef3a9389cb3cd3ce1cec321675a2f21207406b270 /content/browser/android
parenta59f713ddbe376095c435c6c1fa286f2d097966f (diff)
downloadchromium_src-b342991cd48d105202b5066ba2e092589ba1418c.zip
chromium_src-b342991cd48d105202b5066ba2e092589ba1418c.tar.gz
chromium_src-b342991cd48d105202b5066ba2e092589ba1418c.tar.bz2
Navigation transitions: Expose documentLoadedInFrame to WebContentsObserverAndroid.
The TransitionPageHelper in the embedder listens for this before fading out the transition layer. Design doc: https://docs.google.com/a/chromium.org/document/d/17jg1RRL3RI969cLwbKBIcoGDsPwqaEdBxafGNYGwiY4/edit# Implementation details: https://docs.google.com/a/chromium.org/document/d/1kREPtFJaeLoDKwrfmrYTD7DHCdxX1RzFBga2gNY8lyE/edit#heading=h.bng2kpmyvxq5 BUG=370696 Review URL: https://codereview.chromium.org/320493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
-rw-r--r--content/browser/android/web_contents_observer_android.cc11
-rw-r--r--content/browser/android/web_contents_observer_android.h2
2 files changed, 13 insertions, 0 deletions
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc
index 16ad09f..344a901 100644
--- a/content/browser/android/web_contents_observer_android.cc
+++ b/content/browser/android/web_contents_observer_android.cc
@@ -227,6 +227,17 @@ void WebContentsObserverAndroid::DidFinishLoad(
env, obj.obj(), frame_id, jstring_url.obj(), is_main_frame);
}
+void WebContentsObserverAndroid::DocumentLoadedInFrame(
+ int64 frame_id,
+ RenderViewHost* render_view_host) {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
+ if (obj.is_null())
+ return;
+ Java_WebContentsObserverAndroid_documentLoadedInFrame(
+ env, obj.obj(), frame_id);
+}
+
void WebContentsObserverAndroid::NavigationEntryCommitted(
const LoadCommittedDetails& load_details) {
JNIEnv* env = AttachCurrentThread();
diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h
index 9d4421f..dbae8c8 100644
--- a/content/browser/android/web_contents_observer_android.h
+++ b/content/browser/android/web_contents_observer_android.h
@@ -74,6 +74,8 @@ class WebContentsObserverAndroid : public WebContentsObserver {
const GURL& validated_url,
bool is_main_frame,
RenderViewHost* render_view_host) OVERRIDE;
+ virtual void DocumentLoadedInFrame(int64 frame_id,
+ RenderViewHost* render_view_host) OVERRIDE;
virtual void NavigationEntryCommitted(
const LoadCommittedDetails& load_details) OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE;