Print Preview: Make print preview tab modal. (try 2)

chrome/browser/printing/background_printing_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/background_printing_manager.h"
 
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ skipping 48 matching lines @@
   // Multiple sites may share the same RenderProcessHost, so check if this
   // notification has already been added.
   RenderProcessHost* rph = preview_tab->render_view_host()->process();
   if (!registrar_.IsRegistered(this,
                                content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                                content::Source<RenderProcessHost>(rph))) {
     registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                    content::Source<RenderProcessHost>(rph));
   }
 
-  RemoveFromTabStrip(preview_tab);
-
   // Activate the initiator tab.
   PrintPreviewTabController* tab_controller =
       PrintPreviewTabController::GetInstance();
   if (!tab_controller)
     return;
   TabContentsWrapper* initiator_tab =
       tab_controller->GetInitiatorTab(preview_tab);
   if (!initiator_tab)
     return;
   static_cast<RenderViewHostDelegate*>(
       initiator_tab->tab_contents())->Activate();
 }
 
-bool BackgroundPrintingManager::OwnInitiatorTab(
-    TabContentsWrapper* initiator_tab) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(!PrintPreviewTabController::IsPrintPreviewTab(initiator_tab));
-  bool has_initiator_tab = false;
-  for (TabContentsWrapperMap::iterator it = map_.begin(); it != map_.end();
-       ++it) {
-    if (it->second == initiator_tab) {
-      has_initiator_tab = true;
-      break;
-    }
-  }
-  CHECK(!has_initiator_tab);
-
-  PrintPreviewTabController* tab_controller =
-      PrintPreviewTabController::GetInstance();
-  if (!tab_controller)
-    return false;
-  TabContentsWrapper* preview_tab =
-      tab_controller->GetPrintPreviewForTab(initiator_tab);
-  if (!preview_tab)
-    return false;
-
-  map_[preview_tab] = initiator_tab;
-
-  // OwnPrintPreviewTab() may have already added this notification.
-  TabContents* preview_contents = preview_tab->tab_contents();
-  if (!registrar_.IsRegistered(
-          this,
-          content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-          content::Source<TabContents>(preview_contents))) {
-    registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                   content::Source<TabContents>(preview_contents));
-  }
-
-  RemoveFromTabStrip(initiator_tab);
-  return true;
-}
-
 void BackgroundPrintingManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       OnRendererProcessClosed(content::Source<RenderProcessHost>(source).ptr());
       break;
     }
     case chrome::NOTIFICATION_PRINT_JOB_RELEASED: {
@@ skipping 30 matching lines @@
   }
 }
 
 void BackgroundPrintingManager::OnPrintJobReleased(
     TabContentsWrapper* preview_tab) {
   DeletePreviewTab(preview_tab);
 }
 
 void BackgroundPrintingManager::OnTabContentsDestroyed(
     TabContentsWrapper* preview_tab) {
-  bool is_owned_printing_tab = HasPrintPreviewTab(preview_tab);
-  bool is_preview_tab_for_owned_initator_tab =
-      (map_.find(preview_tab) != map_.end());
-  DCHECK(is_owned_printing_tab || is_preview_tab_for_owned_initator_tab);
-
   // Always need to remove this notification since the tab is gone.
   registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                     content::Source<TabContents>(preview_tab->tab_contents()));
 
-  // Delete the associated initiator tab if one exists.
-  if (is_preview_tab_for_owned_initator_tab) {
-    TabContentsWrapper* initiator_tab = map_[preview_tab];
-    map_.erase(preview_tab);
-    MessageLoop::current()->DeleteSoon(FROM_HERE, initiator_tab);
+  if (!HasPrintPreviewTab(preview_tab)) {
+    NOTREACHED();
+    return;
   }
 
-  // If |preview_tab| is not owned, then we are done.
-  if (!is_owned_printing_tab)
-    return;
-
   // Remove NOTIFICATION_RENDERER_PROCESS_CLOSED if |preview_tab| is the last
   // TabContents associated with |rph|.
   bool shared_rph = HasSharedRenderProcessHost(printing_tabs_, preview_tab) ||
       HasSharedRenderProcessHost(printing_tabs_pending_deletion_, preview_tab);
   if (!shared_rph) {
     RenderProcessHost* rph = preview_tab->render_view_host()->process();
     registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                       content::Source<RenderProcessHost>(rph));
   }
 
   // Remove other notifications and remove the tab from its
   // TabContentsWrapperSet.
   if (printing_tabs_.find(preview_tab) != printing_tabs_.end()) {
     registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_RELEASED,
                       content::Source<TabContentsWrapper>(preview_tab));
     printing_tabs_.erase(preview_tab);
   } else {
     // DeletePreviewTab already deleted the notification.
     printing_tabs_pending_deletion_.erase(preview_tab);
   }
 }
 
-void BackgroundPrintingManager::RemoveFromTabStrip(TabContentsWrapper* tab) {
-  Browser* browser = BrowserList::FindBrowserWithID(
-      tab->restore_tab_helper()->window_id().id());
-  DCHECK(browser);
-
-  TabStripModel* tabstrip = browser->tabstrip_model();
-  int index = tabstrip->GetIndexOfTabContents(tab);
-  if (index == TabStripModel::kNoTab)
-    return;
-  tabstrip->DetachTabContentsAt(index);
-}
-
 void BackgroundPrintingManager::DeletePreviewTab(TabContentsWrapper* tab) {
   registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_RELEASED,
                     content::Source<TabContentsWrapper>(tab));
   printing_tabs_.erase(tab);
   printing_tabs_pending_deletion_.insert(tab);
   MessageLoop::current()->DeleteSoon(FROM_HERE, tab);
 }
 
 bool BackgroundPrintingManager::HasSharedRenderProcessHost(
     const TabContentsWrapperSet& set,
@@ skipping 23 matching lines @@
 
 bool BackgroundPrintingManager::HasPrintPreviewTab(
     TabContentsWrapper* preview_tab) {
   if (printing_tabs_.find(preview_tab) != printing_tabs_.end())
     return true;
   return printing_tabs_pending_deletion_.find(preview_tab) !=
       printing_tabs_pending_deletion_.end();
 }
 
 }  // namespace printing