36 lines
1.9 KiB
Diff
36 lines
1.9 KiB
Diff
|
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
|
||
|
|
index c2ce0b39d17f2..72828cd995042 100644
|
||
|
|
--- a/chrome/android/chrome_java_resources.gni
|
||
|
|
+++ b/chrome/android/chrome_java_resources.gni
|
||
|
|
@@ -459,6 +459,7 @@ chrome_java_resources += [
|
||
|
|
"java/res/layout/account_chooser_dialog_title.xml",
|
||
|
|
"java/res/layout/account_divider_preference.xml",
|
||
|
|
"java/res/layout/account_management_account_row.xml",
|
||
|
|
+ "java/res/layout/adblock_editor.xml",
|
||
|
|
"java/res/layout/auto_sign_in_first_run_dialog.xml",
|
||
|
|
"java/res/layout/autofill_billing_address_dropdown.xml",
|
||
|
|
"java/res/layout/autofill_card_name_and_number.xml",
|
||
|
|
@@ -649,6 +650,7 @@ chrome_java_resources += [
|
||
|
|
"java/res/xml/about_chrome_preferences.xml",
|
||
|
|
"java/res/xml/account_management_preferences.xml",
|
||
|
|
"java/res/xml/account_management_preferences_legacy.xml",
|
||
|
|
+ "java/res/xml/adblock_preferences.xml",
|
||
|
|
"java/res/xml/ad_services_config.xml",
|
||
|
|
"java/res/xml/bookmark_widget_info.xml",
|
||
|
|
"java/res/xml/clear_browsing_data_preferences_tab.xml",
|
||
|
|
diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
|
||
|
|
index b1b89688f342d..3222becf6fcf2 100644
|
||
|
|
--- a/chrome/browser/sessions/session_restore_android.cc
|
||
|
|
+++ b/chrome/browser/sessions/session_restore_android.cc
|
||
|
|
@@ -56,7 +56,9 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
|
||
|
|
DCHECK(current_tab);
|
||
|
|
// If swapped, return the current tab's most up-to-date web contents.
|
||
|
|
if (disposition == WindowOpenDisposition::CURRENT_TAB) {
|
||
|
|
- current_tab->SwapWebContents(std::move(new_web_contents), false, false);
|
||
|
|
+ int active_tab_index = tab_model->GetActiveIndex();
|
||
|
|
+ tab_model->CreateTab(current_tab, new_web_contents.release());
|
||
|
|
+ tab_model->CloseTabAt(active_tab_index);
|
||
|
|
return current_tab->web_contents();
|
||
|
|
}
|
||
|
|
DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
|