| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 9a43e9ec72cb041290a73a0c90e590c25a846a69..8a51c86795b21013fe6a3c7a8f55d2eefb8a6532 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -55,7 +55,9 @@
|
| #include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| +#include "chrome/browser/printing/background_printing_manager.h"
|
| #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
|
| +#include "chrome/browser/printing/print_preview_tab_controller.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/sessions/restore_tab_helper.h"
|
| #include "chrome/browser/sessions/session_service.h"
|
| @@ -3230,6 +3232,13 @@ void Browser::CloseContents(TabContents* source) {
|
| return;
|
| }
|
|
|
| + TabContentsWrapper* tab_wrapper =
|
| + TabContentsWrapper::GetCurrentWrapperForContents(source);
|
| + if (g_browser_process->background_printing_manager()->
|
| + OwnInitiatorTabContents(tab_wrapper)) {
|
| + return;
|
| + }
|
| +
|
| int index = tab_handler_->GetTabStripModel()->GetWrapperIndex(source);
|
| if (index == TabStripModel::kNoTab) {
|
| NOTREACHED() << "CloseContents called for tab not in our strip";
|
|
|