Print Preview: Open print preview tab in the right position when the source is a popup.

chrome/browser/printing/print_preview_tab_controller.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/print_preview_tab_controller.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 73 matching lines @@
   if (!g_browser_process)
     return NULL;
   return g_browser_process->print_preview_tab_controller();
 }
 
 // static
 void PrintPreviewTabController::PrintPreview(TabContentsWrapper* tab) {
   if (tab->tab_contents()->showing_interstitial_page())
     return;
 
-  PrintPreviewTabController* tab_controller =
-      PrintPreviewTabController::GetInstance();
+  PrintPreviewTabController* tab_controller = GetInstance();
   if (!tab_controller)
     return;
   tab_controller->GetOrCreatePreviewTab(tab);
 }
 
 TabContentsWrapper* PrintPreviewTabController::GetOrCreatePreviewTab(
     TabContentsWrapper* initiator_tab) {
   DCHECK(initiator_tab);
 
   // Get the print preview tab for |initiator_tab|.
@@ skipping 54 matching lines @@
       NOTREACHED();
       break;
     }
   }
 }
 
 void PrintPreviewTabController::OnRendererProcessClosed(
     RenderProcessHost* rph) {
   for (PrintPreviewTabMap::iterator iter = preview_tab_map_.begin();
        iter != preview_tab_map_.end(); ++iter) {
-    if (iter->second != NULL &&
-        iter->second->render_view_host()->process() == rph) {
-      TabContentsWrapper* preview_tab = GetPrintPreviewForTab(iter->second);
+    TabContentsWrapper* initiator_tab = iter->second;
+    if (initiator_tab &&
+        initiator_tab->render_view_host()->process() == rph) {
+      TabContentsWrapper* preview_tab = iter->first;
       PrintPreviewUI* print_preview_ui =
           static_cast<PrintPreviewUI*>(preview_tab->web_ui());
       print_preview_ui->OnInitiatorTabCrashed();
     }
   }
 }
 
 void PrintPreviewTabController::OnTabContentsDestroyed(
     TabContentsWrapper* tab) {
   TabContentsWrapper* preview_tab = GetPrintPreviewForTab(tab);
@@ skipping 130 matching lines @@
     }
   }
 
   // Add a new tab next to initiator tab.
   browser::NavigateParams params(current_browser,
                                  GURL(chrome::kChromeUIPrintURL),
                                  PageTransition::LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame))
     params.disposition = NEW_POPUP;
-  params.tabstrip_index = current_browser->tabstrip_model()->
-      GetIndexOfTabContents(initiator_tab) + 1;
+
+  // For normal tabs, set the position as immediately to the right,
+  // otherwise let the tab strip decide.
+  if (current_browser->is_type_tabbed()) {
+    params.tabstrip_index = current_browser->tabstrip_model()->
+        GetIndexOfTabContents(initiator_tab) + 1;
+  }
+
   browser::Navigate(&params);
   TabContentsWrapper* preview_tab = params.target_contents;
   EnableInternalPDFPluginForTab(preview_tab);
   static_cast<RenderViewHostDelegate*>(preview_tab->tab_contents())->Activate();
 
   // Add an entry to the map.
   preview_tab_map_[preview_tab] = initiator_tab;
   waiting_for_new_preview_page_ = true;
 
   AddObservers(initiator_tab);
@@ skipping 44 matching lines @@
   RenderProcessHost* rph = tab->render_view_host()->process();
   if (registrar_.IsRegistered(this,
                               content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                               Source<RenderProcessHost>(rph))) {
     registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                       Source<RenderProcessHost>(rph));
   }
 }
 
 }  // namespace printing