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

Unified Diff: chrome/browser/sessions/session_restore_android.cc

Issue 36473002: Foreign session pages now load into current tab. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
Index: chrome/browser/sessions/session_restore_android.cc
diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
index 9261700eff7049665b447ce0e03fcd0efcef1f71..a6c5ff98427f0600cc1f3ec9b85e33353c982a5c 100644
--- a/chrome/browser/sessions/session_restore_android.cc
+++ b/chrome/browser/sessions/session_restore_android.cc
@@ -6,12 +6,13 @@
#include <vector>
+#include "chrome/browser/android/tab_android.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/android/tab_model/tab_model.h"
#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/web_contents.h"
@@ -37,7 +38,10 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
selected_index,
content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
&entries);
- tab_model->CreateTab(new_web_contents);
+
+ TabAndroid* current_tab= TabAndroid::FromWebContents(web_contents);
+ DCHECK(current_tab);
newt (away) 2013/11/01 23:41:32 Check the value of disposition here and either ope
apiccion 2013/11/02 01:01:14 Done.
+ current_tab->SwapTabContents(web_contents, new_web_contents);
return new_web_contents;
}

Powered by Google App Engine
This is Rietveld 408576698