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

Unified Diff: chrome/browser/android/tab_android.cc

Issue 143463012: Pass rendering state on swapping in a prerendered page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dev
Patch Set: sync Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 73e61c0d53e428ac443049417305d74b6e7c7585..3f622b17a275234a6788fc9a9684f3b436b47263 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -258,7 +258,9 @@ bool TabAndroid::ShouldWelcomePageLinkToTermsOfService() {
}
void TabAndroid::SwapTabContents(content::WebContents* old_contents,
- content::WebContents* new_contents) {
+ content::WebContents* new_contents,
+ bool did_start_load,
+ bool did_finish_load) {
JNIEnv* env = base::android::AttachCurrentThread();
// We need to notify the native InfobarContainer so infobars can be swapped.
@@ -274,7 +276,9 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents,
Java_TabBase_swapWebContents(
env,
weak_java_tab_.get(env).obj(),
- reinterpret_cast<intptr_t>(new_contents));
+ reinterpret_cast<intptr_t>(new_contents),
+ did_start_load,
+ did_finish_load);
}
void TabAndroid::Observe(int type,
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698