| 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..887ba39a709e68b0e9256761adda9b7189d8c0dd 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,16 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
|
| selected_index,
|
| content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
|
| &entries);
|
| - tab_model->CreateTab(new_web_contents);
|
| +
|
| + if (disposition == CURRENT_TAB) {
|
| + TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents);
|
| + DCHECK(current_tab);
|
| + current_tab->SwapTabContents(web_contents, new_web_contents);
|
| + delete web_contents;
|
| + } else {
|
| + DCHECK_EQ(disposition, NEW_FOREGROUND_TAB);
|
| + tab_model->CreateTab(new_web_contents);
|
| + }
|
| return new_web_contents;
|
| }
|
|
|
|
|