Cleanup: Remove more uses of deprecated PrintPreviewDialogController methods.

chrome/browser/printing/print_preview_dialog_controller.cc

 // Copyright (c) 2012 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_dialog_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 197 matching lines @@
 }
 
 // static
 PrintPreviewDialogController* PrintPreviewDialogController::GetInstance() {
   if (!g_browser_process)
     return NULL;
   return g_browser_process->print_preview_dialog_controller();
 }
 
 // static
-void PrintPreviewDialogController::PrintPreview(WebContents* tab) {
-  if (tab->ShowingInterstitialPage())
+void PrintPreviewDialogController::PrintPreview(WebContents* initiator_tab) {
+  if (initiator_tab->ShowingInterstitialPage())
     return;
 
-  PrintPreviewDialogController* tab_controller = GetInstance();
-  if (!tab_controller)
+  PrintPreviewDialogController* dialog_controller = GetInstance();
+  if (!dialog_controller)
     return;
-  if (!tab_controller->GetOrCreatePreviewTab(tab))
-    PrintViewManager::FromWebContents(tab)->PrintPreviewDone();
+  if (!dialog_controller->GetOrCreatePreviewDialog(initiator_tab))
+    PrintViewManager::FromWebContents(initiator_tab)->PrintPreviewDone();
 }
 
 WebContents* PrintPreviewDialogController::GetOrCreatePreviewDialog(
     WebContents* initiator_tab) {
-  return GetOrCreatePreviewTab(initiator_tab);
-}
-
-WebContents* PrintPreviewDialogController::GetOrCreatePreviewTab(
-    WebContents* initiator_tab) {
   DCHECK(initiator_tab);
 
-  // Get the print preview tab for |initiator_tab|.
-  WebContents* preview_tab = GetPrintPreviewForTab(initiator_tab);
-  if (!preview_tab)
+  // Get the print preview dialog for |initiator_tab|.
+  WebContents* preview_dialog = GetPrintPreviewForContents(initiator_tab);
+  if (!preview_dialog)
     return CreatePrintPreviewTab(initiator_tab);
 
-  // Show the initiator tab holding the existing preview tab.
+  // Show the initiator tab holding the existing preview dialog.
   initiator_tab->GetDelegate()->ActivateContents(initiator_tab);
-  return preview_tab;
+  return preview_dialog;
 }
 
 WebContents* PrintPreviewDialogController::GetPrintPreviewForContents(
     WebContents* contents) const {
-  return GetPrintPreviewForTab(contents);
-}
-
-WebContents* PrintPreviewDialogController::GetPrintPreviewForTab(
-    WebContents* tab) const {
-  // |preview_tab_map_| is keyed by the preview tab, so if find() succeeds, then
-  // |tab| is the preview tab.
-  PrintPreviewTabMap::const_iterator it = preview_tab_map_.find(tab);
+  // |preview_tab_map_| is keyed by the preview dialog, so if find() succeeds,
+  // then |contents| is the preview dialog.
+  PrintPreviewTabMap::const_iterator it = preview_tab_map_.find(contents);
   if (it != preview_tab_map_.end())
-    return tab;
+    return contents;
 
   for (it = preview_tab_map_.begin(); it != preview_tab_map_.end(); ++it) {
-    // If |tab| is an initiator tab.
-    if (tab == it->second) {
+    // If |contents| is an initiator tab.

[Vitaly Buka (NO REVIEWS), 2013/02/12 19:45:24]

I understand how it works, but this loop after search looks weird.

+    if (contents == it->second) {
       // Return the associated preview tab.
       return it->first;
     }
   }
   return NULL;
 }
 
 WebContents* PrintPreviewDialogController::GetInitiatorTab(
     WebContents* preview_tab) {
   PrintPreviewTabMap::iterator it = preview_tab_map_.find(preview_tab);
@@ skipping 19 matching lines @@
         content::Details<content::LoadCommittedDetails>(details).ptr());
   }
 }
 
 // static
 bool PrintPreviewDialogController::IsPrintPreviewDialog(WebContents* contents) {
   return IsPrintPreviewURL(contents->GetURL());
 }
 
 // static
-bool PrintPreviewDialogController::IsPrintPreviewTab(WebContents* tab) {
-  return IsPrintPreviewURL(tab->GetURL());
-}
-
-// static
 bool PrintPreviewDialogController::IsPrintPreviewURL(const GURL& url) {
   return (url.SchemeIs(chrome::kChromeUIScheme) &&
           url.host() == chrome::kChromeUIPrintHost);
 }
 
 void PrintPreviewDialogController::EraseInitiatorTabInfo(
     WebContents* preview_tab) {
   PrintPreviewTabMap::iterator it = preview_tab_map_.find(preview_tab);
   if (it == preview_tab_map_.end())
     return;
@@ skipping 32 matching lines @@
         closed_preview_tabs[i]->GetWebUI()->GetController());
     if (print_preview_ui)
       print_preview_ui->OnPrintPreviewDialogClosed();
   }
 
   for (size_t i = 0; i < closed_initiator_tabs.size(); ++i)
     RemoveInitiatorTab(closed_initiator_tabs[i]);
 }
 
 void PrintPreviewDialogController::OnWebContentsDestroyed(WebContents* tab) {
-  WebContents* preview_tab = GetPrintPreviewForTab(tab);
+  WebContents* preview_tab = GetPrintPreviewForContents(tab);
   if (!preview_tab) {
     NOTREACHED();
     return;
   }
 
   if (tab == preview_tab)
     RemovePreviewTab(tab);
   else
     RemoveInitiatorTab(tab);
 }
 
 void PrintPreviewDialogController::OnNavEntryCommitted(
     WebContents* tab, content::LoadCommittedDetails* details) {
-  WebContents* preview_tab = GetPrintPreviewForTab(tab);
+  WebContents* preview_tab = GetPrintPreviewForContents(tab);
   if (!preview_tab) {
     NOTREACHED();
     return;
   }
   bool source_tab_is_preview_tab = (tab == preview_tab);
 
   if (source_tab_is_preview_tab) {
     // Preview tab navigated.
     if (details) {
       content::PageTransition transition_type =
@@ skipping 107 matching lines @@
       tab->GetRenderProcessHost());
   if (registrar_.IsRegistered(this,
       content::NOTIFICATION_RENDERER_PROCESS_CLOSED, rph_source)) {
     registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                       rph_source);
   }
 }
 
 void PrintPreviewDialogController::RemoveInitiatorTab(
     WebContents* initiator_tab) {
-  WebContents* preview_tab = GetPrintPreviewForTab(initiator_tab);
+  WebContents* preview_tab = GetPrintPreviewForContents(initiator_tab);
   DCHECK(preview_tab);
   // Update the map entry first, so when the print preview tab gets destroyed
   // and reaches RemovePreviewTab(), it does not attempt to also remove the
   // initiator tab's observers.
   preview_tab_map_[preview_tab] = NULL;
   RemoveObservers(initiator_tab);
 
   PrintViewManager::FromWebContents(initiator_tab)->PrintPreviewDone();
 
   // Initiator tab is closed. Close the print preview tab too.
@@ skipping 16 matching lines @@
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnPrintPreviewDialogDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing