Rename PrintPreviewTabController to PrintPreviewDialogController; Rename BrowserProcess::print_preview_tab_controller() to print_preview_dialog_controller().

BUG=163671
Review URL: https://codereview.chromium.org/11557030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173856 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 125 insertions, 124 deletions

diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 4cff57c..d0bc0df 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
@@ -506,8 +506,8 @@ bool GetTabForId(const AutomationId& id, WebContents** tab) {
   if (id.type() != AutomationId::kTypeTab)
     return false;
 
-  printing::PrintPreviewTabController* preview_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* preview_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   BrowserList::const_iterator iter = BrowserList::begin();
   for (; iter != BrowserList::end(); ++iter) {
     Browser* browser = *iter;
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 45670f5..2bfddae 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -76,7 +76,7 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -5959,8 +5959,8 @@ void TestingAutomationProvider::GetTabIds(
 void TestingAutomationProvider::GetViews(
     DictionaryValue* args, IPC::Message* reply_message) {
   ListValue* view_list = new ListValue();
-  printing::PrintPreviewTabController* preview_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* preview_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   BrowserList::const_iterator browser_iter = BrowserList::begin();
   for (; browser_iter != BrowserList::end(); ++browser_iter) {
     Browser* browser = *browser_iter;
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 8afdb2a..4a02629 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -71,7 +71,7 @@ class PrerenderTracker;
 namespace printing {
 class BackgroundPrintingManager;
 class PrintJobManager;
-class PrintPreviewTabController;
+class PrintPreviewDialogController;
 }
 
 namespace safe_browsing {
@@ -152,8 +152,8 @@ class BrowserProcess {
   virtual bool IsShuttingDown() = 0;
 
   virtual printing::PrintJobManager* print_job_manager() = 0;
-  virtual printing::PrintPreviewTabController*
-      print_preview_tab_controller() = 0;
+  virtual printing::PrintPreviewDialogController*
+      print_preview_dialog_controller() = 0;
   virtual printing::BackgroundPrintingManager*
       background_printing_manager() = 0;
 
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 7bb57d0..bd0b15e 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -53,7 +53,7 @@
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ -526,13 +526,13 @@ printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
   return print_job_manager_.get();
 }
 
-printing::PrintPreviewTabController*
-    BrowserProcessImpl::print_preview_tab_controller() {
+printing::PrintPreviewDialogController*
+    BrowserProcessImpl::print_preview_dialog_controller() {
 #if defined(ENABLE_PRINTING)
   DCHECK(CalledOnValidThread());
-  if (!print_preview_tab_controller_.get())
-    CreatePrintPreviewTabController();
-  return print_preview_tab_controller_.get();
+  if (!print_preview_dialog_controller_.get())
+    CreatePrintPreviewDialogController();
+  return print_preview_dialog_controller_.get();
 #else
   NOTIMPLEMENTED();
   return NULL;
@@ -869,10 +869,11 @@ void BrowserProcessImpl::CreateStatusTray() {
   status_tray_.reset(StatusTray::Create());
 }
 
-void BrowserProcessImpl::CreatePrintPreviewTabController() {
+void BrowserProcessImpl::CreatePrintPreviewDialogController() {
 #if defined(ENABLE_PRINTING)
-  DCHECK(print_preview_tab_controller_.get() == NULL);
-  print_preview_tab_controller_ = new printing::PrintPreviewTabController();
+  DCHECK(print_preview_dialog_controller_.get() == NULL);
+  print_preview_dialog_controller_ =
+      new printing::PrintPreviewDialogController();
 #else
   NOTIMPLEMENTED();
 #endif
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 49671ff..85fcc40 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -98,8 +98,8 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual unsigned int ReleaseModule() OVERRIDE;
   virtual bool IsShuttingDown() OVERRIDE;
   virtual printing::PrintJobManager* print_job_manager() OVERRIDE;
-  virtual printing::PrintPreviewTabController*
-      print_preview_tab_controller() OVERRIDE;
+  virtual printing::PrintPreviewDialogController*
+      print_preview_dialog_controller() OVERRIDE;
   virtual printing::BackgroundPrintingManager*
       background_printing_manager() OVERRIDE;
   virtual IntranetRedirectDetector* intranet_redirect_detector() OVERRIDE;
@@ -140,7 +140,7 @@ class BrowserProcessImpl : public BrowserProcess,
   void CreateIntranetRedirectDetector();
   void CreateNotificationUIManager();
   void CreateStatusTrayManager();
-  void CreatePrintPreviewTabController();
+  void CreatePrintPreviewDialogController();
   void CreateBackgroundPrintingManager();
   void CreateSafeBrowsingService();
   void CreateSafeBrowsingDetectionService();
@@ -193,8 +193,8 @@ class BrowserProcessImpl : public BrowserProcess,
 
   scoped_ptr<chrome::MediaFileSystemRegistry> media_file_system_registry_;
 
-  scoped_refptr<printing::PrintPreviewTabController>
-      print_preview_tab_controller_;
+  scoped_refptr<printing::PrintPreviewDialogController>
+      print_preview_dialog_controller_;
 
   scoped_ptr<printing::BackgroundPrintingManager> background_printing_manager_;
 
diff --git a/chrome/browser/printing/background_printing_manager.cc b/chrome/browser/printing/background_printing_manager.cc
index cd5be42..05274a5 100644
--- a/chrome/browser/printing/background_printing_manager.cc
+++ b/chrome/browser/printing/background_printing_manager.cc
@@ -5,7 +5,7 @@
 #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/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -35,7 +35,7 @@ BackgroundPrintingManager::~BackgroundPrintingManager() {
 
 void BackgroundPrintingManager::OwnPrintPreviewTab(WebContents* preview_tab) {
   DCHECK(CalledOnValidThread());
-  DCHECK(PrintPreviewTabController::IsPrintPreviewTab(preview_tab));
+  DCHECK(PrintPreviewDialogController::IsPrintPreviewTab(preview_tab));
   CHECK(!HasPrintPreviewTab(preview_tab));
 
   printing_tabs_.insert(preview_tab);
@@ -64,8 +64,8 @@ void BackgroundPrintingManager::OwnPrintPreviewTab(WebContents* preview_tab) {
   }
 
   // Activate the initiator tab.
-  PrintPreviewTabController* tab_controller =
-      PrintPreviewTabController::GetInstance();
+  PrintPreviewDialogController* tab_controller =
+      PrintPreviewDialogController::GetInstance();
   if (!tab_controller)
     return;
   WebContents* initiator_tab = tab_controller->GetInitiatorTab(preview_tab);
diff --git a/chrome/browser/printing/print_preview_context_menu_observer.cc b/chrome/browser/printing/print_preview_context_menu_observer.cc
index edc8f42..4e0a2a2 100644
--- a/chrome/browser/printing/print_preview_context_menu_observer.cc
+++ b/chrome/browser/printing/print_preview_context_menu_observer.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 
 PrintPreviewContextMenuObserver::PrintPreviewContextMenuObserver(
     content::WebContents* tab) : tab_(tab) {
@@ -16,8 +16,8 @@ PrintPreviewContextMenuObserver::~PrintPreviewContextMenuObserver() {
 }
 
 bool PrintPreviewContextMenuObserver::IsPrintPreviewTab() {
-  printing::PrintPreviewTabController* controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* controller =
+      printing::PrintPreviewDialogController::GetInstance();
   if (!controller)
     return false;
   return !!controller->GetPrintPreviewForTab(tab_);
diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index b6fe803..7a94374 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -2,7 +2,7 @@
 // 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 "chrome/browser/printing/print_preview_dialog_controller.h"
 
 #include <algorithm>
 #include <string>
@@ -202,31 +202,31 @@ void PrintPreviewWebContentDelegate::HandleKeyboardEvent(
 
 namespace printing {
 
-PrintPreviewTabController::PrintPreviewTabController()
+PrintPreviewDialogController::PrintPreviewDialogController()
     : waiting_for_new_preview_page_(false),
       is_creating_print_preview_tab_(false) {
 }
 
 // static
-PrintPreviewTabController* PrintPreviewTabController::GetInstance() {
+PrintPreviewDialogController* PrintPreviewDialogController::GetInstance() {
   if (!g_browser_process)
     return NULL;
-  return g_browser_process->print_preview_tab_controller();
+  return g_browser_process->print_preview_dialog_controller();
 }
 
 // static
-void PrintPreviewTabController::PrintPreview(WebContents* tab) {
+void PrintPreviewDialogController::PrintPreview(WebContents* tab) {
   if (tab->ShowingInterstitialPage())
     return;
 
-  PrintPreviewTabController* tab_controller = GetInstance();
+  PrintPreviewDialogController* tab_controller = GetInstance();
   if (!tab_controller)
     return;
   if (!tab_controller->GetOrCreatePreviewTab(tab))
     printing::PrintViewManager::FromWebContents(tab)->PrintPreviewDone();
 }
 
-WebContents* PrintPreviewTabController::GetOrCreatePreviewTab(
+WebContents* PrintPreviewDialogController::GetOrCreatePreviewTab(
     WebContents* initiator_tab) {
   DCHECK(initiator_tab);
 
@@ -240,7 +240,7 @@ WebContents* PrintPreviewTabController::GetOrCreatePreviewTab(
   return preview_tab;
 }
 
-WebContents* PrintPreviewTabController::GetPrintPreviewForTab(
+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.
@@ -258,7 +258,7 @@ WebContents* PrintPreviewTabController::GetPrintPreviewForTab(
   return NULL;
 }
 
-WebContents* PrintPreviewTabController::GetInitiatorTab(
+WebContents* PrintPreviewDialogController::GetInitiatorTab(
     WebContents* preview_tab) {
   PrintPreviewTabMap::iterator it = preview_tab_map_.find(preview_tab);
   if (it != preview_tab_map_.end())
@@ -266,7 +266,7 @@ WebContents* PrintPreviewTabController::GetInitiatorTab(
   return NULL;
 }
 
-void PrintPreviewTabController::Observe(
+void PrintPreviewDialogController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ -285,17 +285,17 @@ void PrintPreviewTabController::Observe(
 }
 
 // static
-bool PrintPreviewTabController::IsPrintPreviewTab(WebContents* tab) {
+bool PrintPreviewDialogController::IsPrintPreviewTab(WebContents* tab) {
   return IsPrintPreviewURL(tab->GetURL());
 }
 
 // static
-bool PrintPreviewTabController::IsPrintPreviewURL(const GURL& url) {
+bool PrintPreviewDialogController::IsPrintPreviewURL(const GURL& url) {
   return (url.SchemeIs(chrome::kChromeUIScheme) &&
           url.host() == chrome::kChromeUIPrintHost);
 }
 
-void PrintPreviewTabController::EraseInitiatorTabInfo(
+void PrintPreviewDialogController::EraseInitiatorTabInfo(
     WebContents* preview_tab) {
   PrintPreviewTabMap::iterator it = preview_tab_map_.find(preview_tab);
   if (it == preview_tab_map_.end())
@@ -305,13 +305,13 @@ void PrintPreviewTabController::EraseInitiatorTabInfo(
   preview_tab_map_[preview_tab] = NULL;
 }
 
-bool PrintPreviewTabController::is_creating_print_preview_tab() const {
+bool PrintPreviewDialogController::is_creating_print_preview_tab() const {
   return is_creating_print_preview_tab_;
 }
 
-PrintPreviewTabController::~PrintPreviewTabController() {}
+PrintPreviewDialogController::~PrintPreviewDialogController() {}
 
-void PrintPreviewTabController::OnRendererProcessClosed(
+void PrintPreviewDialogController::OnRendererProcessClosed(
     content::RenderProcessHost* rph) {
   // Store tabs in a vector and deal with them after iterating through
   // |preview_tab_map_| because RemoveFooTab() can change |preview_tab_map_|.
@@ -341,7 +341,7 @@ void PrintPreviewTabController::OnRendererProcessClosed(
     RemoveInitiatorTab(closed_initiator_tabs[i]);
 }
 
-void PrintPreviewTabController::OnWebContentsDestroyed(WebContents* tab) {
+void PrintPreviewDialogController::OnWebContentsDestroyed(WebContents* tab) {
   WebContents* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab) {
     NOTREACHED();
@@ -354,7 +354,7 @@ void PrintPreviewTabController::OnWebContentsDestroyed(WebContents* tab) {
     RemoveInitiatorTab(tab);
 }
 
-void PrintPreviewTabController::OnNavEntryCommitted(
+void PrintPreviewDialogController::OnNavEntryCommitted(
     WebContents* tab, content::LoadCommittedDetails* details) {
   WebContents* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab) {
@@ -394,7 +394,7 @@ void PrintPreviewTabController::OnNavEntryCommitted(
   RemoveInitiatorTab(tab);
 }
 
-WebContents* PrintPreviewTabController::CreatePrintPreviewTab(
+WebContents* PrintPreviewDialogController::CreatePrintPreviewTab(
     WebContents* initiator_tab) {
   base::AutoReset<bool> auto_reset(&is_creating_print_preview_tab_, true);
   Profile* profile =
@@ -437,7 +437,7 @@ WebContents* PrintPreviewTabController::CreatePrintPreviewTab(
   return preview_tab;
 }
 
-void PrintPreviewTabController::SetInitiatorTabURLAndTitle(
+void PrintPreviewDialogController::SetInitiatorTabURLAndTitle(
     WebContents* preview_tab) {
   WebContents* initiator_tab = GetInitiatorTab(preview_tab);
   if (initiator_tab && preview_tab->GetWebUI()) {
@@ -450,7 +450,7 @@ void PrintPreviewTabController::SetInitiatorTabURLAndTitle(
   }
 }
 
-void PrintPreviewTabController::AddObservers(WebContents* tab) {
+void PrintPreviewDialogController::AddObservers(WebContents* tab) {
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::Source<WebContents>(tab));
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
@@ -467,7 +467,7 @@ void PrintPreviewTabController::AddObservers(WebContents* tab) {
   }
 }
 
-void PrintPreviewTabController::RemoveObservers(WebContents* tab) {
+void PrintPreviewDialogController::RemoveObservers(WebContents* tab) {
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                     content::Source<WebContents>(tab));
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
@@ -484,7 +484,8 @@ void PrintPreviewTabController::RemoveObservers(WebContents* tab) {
   }
 }
 
-void PrintPreviewTabController::RemoveInitiatorTab(WebContents* initiator_tab) {
+void PrintPreviewDialogController::RemoveInitiatorTab(
+    WebContents* initiator_tab) {
   WebContents* preview_tab = GetPrintPreviewForTab(initiator_tab);
   DCHECK(preview_tab);
   // Update the map entry first, so when the print preview tab gets destroyed
@@ -503,7 +504,7 @@ void PrintPreviewTabController::RemoveInitiatorTab(WebContents* initiator_tab) {
     print_preview_ui->OnInitiatorTabClosed();
 }
 
-void PrintPreviewTabController::RemovePreviewTab(WebContents* preview_tab) {
+void PrintPreviewDialogController::RemovePreviewTab(WebContents* preview_tab) {
   // Remove the initiator tab's observers before erasing the mapping.
   WebContents* initiator_tab = GetInitiatorTab(preview_tab);
   if (initiator_tab) {
diff --git a/chrome/browser/printing/print_preview_tab_controller.h b/chrome/browser/printing/print_preview_dialog_controller.h
index 023404c..23a0f19 100644
--- a/chrome/browser/printing/print_preview_tab_controller.h
+++ b/chrome/browser/printing/print_preview_dialog_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_PRINTING_PRINT_PREVIEW_TAB_CONTROLLER_H_
-#define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_TAB_CONTROLLER_H_
+#ifndef CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
+#define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
 
 #include <map>
 
@@ -35,13 +35,13 @@ namespace printing {
 // be reevaluated as to whether they're useful. The comments, both here and in
 // the tests, need to be fixed so that they don't lie.
 // http://crbug.com/163671
-class PrintPreviewTabController
-    : public base::RefCounted<PrintPreviewTabController>,
+class PrintPreviewDialogController
+    : public base::RefCounted<PrintPreviewDialogController>,
       public content::NotificationObserver {
  public:
-  PrintPreviewTabController();
+  PrintPreviewDialogController();
 
-  static PrintPreviewTabController* GetInstance();
+  static PrintPreviewDialogController* GetInstance();
 
   // Initiate print preview for |initiator_tab|.
   // Call this instead of GetOrCreatePreviewTab().
@@ -78,7 +78,7 @@ class PrintPreviewTabController
   bool is_creating_print_preview_tab() const;
 
  private:
-  friend class base::RefCounted<PrintPreviewTabController>;
+  friend class base::RefCounted<PrintPreviewDialogController>;
 
   // 1:1 relationship between initiator tab and print preview tab.
   // Key: Preview tab.
@@ -86,7 +86,7 @@ class PrintPreviewTabController
   typedef std::map<content::WebContents*, content::WebContents*>
       PrintPreviewTabMap;
 
-  virtual ~PrintPreviewTabController();
+  virtual ~PrintPreviewDialogController();
 
   // Handler for the RENDERER_PROCESS_CLOSED notification. This is observed when
   // the initiator renderer crashed.
@@ -127,13 +127,13 @@ class PrintPreviewTabController
   // content::NAVIGATION_TYPE_NEW_PAGE.
   bool waiting_for_new_preview_page_;
 
-  // Whether the PrintPreviewTabController is in the middle of creating a
+  // Whether the PrintPreviewDialogController is in the middle of creating a
   // print preview tab.
   bool is_creating_print_preview_tab_;
 
-  DISALLOW_COPY_AND_ASSIGN(PrintPreviewTabController);
+  DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogController);
 };
 
 }  // namespace printing
 
-#endif  // CHROME_BROWSER_PRINTING_PRINT_PREVIEW_TAB_CONTROLLER_H_
+#endif  // CHROME_BROWSER_PRINTING_PRINT_PREVIEW_DIALOG_CONTROLLER_H_
diff --git a/chrome/browser/printing/print_preview_tab_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
index d90b53f..251da63 100644
--- a/chrome/browser/printing/print_preview_tab_controller_browsertest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -19,10 +19,10 @@
 
 using content::WebContents;
 
-class PrintPreviewTabControllerBrowserTest : public InProcessBrowserTest {
+class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
  public:
-  PrintPreviewTabControllerBrowserTest() {}
-  virtual ~PrintPreviewTabControllerBrowserTest() {}
+  PrintPreviewDialogControllerBrowserTest() {}
+  virtual ~PrintPreviewDialogControllerBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
 #if !defined(GOOGLE_CHROME_BUILD)
@@ -51,7 +51,7 @@ class TabDestroyedObserver : public content::WebContentsObserver {
 
 // Test to verify that when a initiator tab navigates, we can create a new
 // preview tab for the new tab contents.
-IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
                        NavigateFromInitiatorTab) {
   // Lets start with one tab.
   EXPECT_EQ(1, browser()->tab_count());
@@ -61,8 +61,8 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest,
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator_tab);
 
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Get the preview tab for initiator tab.
@@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest,
 
 // Test to verify that after reloading the initiator tab, it creates a new
 // print preview tab.
-IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest,
+IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
                        ReloadInitiatorTab) {
   // Lets start with one tab.
   EXPECT_EQ(1, browser()->tab_count());
@@ -106,8 +106,8 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest,
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator_tab);
 
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Get the preview tab for initiator tab.
diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
index 35a026e..2f047706 100644
--- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_unittest.cc
@@ -2,7 +2,7 @@
 // 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 "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_preview_test.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -29,10 +29,10 @@ using content::WebContents;
 #define MAYBE_ClearInitiatorTabDetails ClearInitiatorTabDetails
 #endif
 
-typedef PrintPreviewTest PrintPreviewTabControllerUnitTest;
+typedef PrintPreviewTest PrintPreviewDialogControllerUnitTest;
 
 // Create/Get a preview tab for initiator tab.
-TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
+TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
   // Lets start with one window with one tab.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
@@ -43,8 +43,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
   WebContents* initiator_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Get the preview tab for initiator tab.
@@ -70,7 +70,7 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) {
 // To show multiple print preview tabs exist in the same browser for
 // different initiator tabs. If preview tab already exists for an initiator, it
 // gets focused.
-TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) {
+TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_MultiplePreviewTabs) {
   // Lets start with one window and two tabs.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
@@ -86,8 +86,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) {
   ASSERT_TRUE(web_contents_2);
   EXPECT_EQ(2, browser()->tab_count());
 
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Create preview tab for |tab_contents_1|
@@ -129,7 +129,7 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) {
 }
 
 // Clear the initiator tab details associated with preview tab.
-TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
+TEST_F(PrintPreviewDialogControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
   // Lets start with one window with one tab.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
@@ -140,8 +140,8 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_ClearInitiatorTabDetails) {
   WebContents* initiator_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(tab_controller);
 
   // Get the preview tab for initiator tab.
diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index 8142387..ef1a8fb 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -12,7 +12,7 @@
 #include "base/shared_memory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
@@ -75,8 +75,8 @@ PrintPreviewMessageHandler::~PrintPreviewMessageHandler() {
 }
 
 WebContents* PrintPreviewMessageHandler::GetPrintPreviewTab() {
-  PrintPreviewTabController* tab_controller =
-      PrintPreviewTabController::GetInstance();
+  PrintPreviewDialogController* tab_controller =
+      PrintPreviewDialogController::GetInstance();
   if (!tab_controller)
     return NULL;
 
@@ -96,7 +96,7 @@ void PrintPreviewMessageHandler::OnRequestPrintPreview(
     printing::PrintViewManager::FromWebContents(web_contents())->
         PrintPreviewForWebNode();
   }
-  PrintPreviewTabController::PrintPreview(web_contents());
+  PrintPreviewDialogController::PrintPreview(web_contents());
   PrintPreviewUI::SetSourceIsModifiable(GetPrintPreviewTab(),
                                         source_is_modifiable);
 }
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index c4c7feb..55a7248 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/printing/print_error_dialog.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager_observer.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/profiles/profile.h"
@@ -102,8 +102,8 @@ bool PrintViewManager::PrintForSystemDialogNow() {
 }
 
 bool PrintViewManager::AdvancedPrintNow() {
-  PrintPreviewTabController* tab_controller =
-      PrintPreviewTabController::GetInstance();
+  PrintPreviewDialogController* tab_controller =
+      PrintPreviewDialogController::GetInstance();
   if (!tab_controller)
     return false;
   WebContents* print_preview_tab =
@@ -327,8 +327,8 @@ void PrintViewManager::OnScriptedPrintPreview(bool source_is_modifiable,
     return;
   }
 
-  PrintPreviewTabController* tab_controller =
-      PrintPreviewTabController::GetInstance();
+  PrintPreviewDialogController* tab_controller =
+      PrintPreviewDialogController::GetInstance();
   if (!tab_controller) {
     Send(reply_msg);
     return;
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 833f8ab..e9e2b75 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/tab_contents/render_view_context_menu.h"
+
 #include <algorithm>
 #include <set>
 #include <utility>
 
-#include "chrome/browser/tab_contents/render_view_context_menu.h"
-
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ -32,7 +32,7 @@
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_preview_context_menu_observer.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
@@ -1141,7 +1141,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
       return (params_.media_flags & WebContextMenuData::MediaCanSave) &&
           url.is_valid() && ProfileIOData::IsHandledProtocol(url.scheme()) &&
           // Do not save the preview PDF on the print preview page.
-          !(printing::PrintPreviewTabController::IsPrintPreviewURL(url));
+          !(printing::PrintPreviewDialogController::IsPrintPreviewURL(url));
     }
 
     case IDC_CONTENT_CONTEXT_OPENAVNEWTAB:
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index f91ef9c..49ade84 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -24,7 +24,7 @@
 #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/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/rlz/rlz.h"
@@ -185,8 +185,8 @@ bool HasConstrainedWindow(const Browser* browser) {
 
 bool PrintPreviewShowing(const Browser* browser) {
   WebContents* contents = browser->tab_strip_model()->GetActiveWebContents();
-  printing::PrintPreviewTabController* controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* controller =
+      printing::PrintPreviewDialogController::GetInstance();
   return controller && (controller->GetPrintPreviewForTab(contents) ||
                         controller->is_creating_print_preview_tab());
 }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 75f4d18..a9132ef 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_error_dialog.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_system_task_proxy.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/printer_manager_dialog.h"
@@ -816,8 +816,8 @@ void PrintPreviewHandler::SendCloudPrintJob() {
 }
 
 WebContents* PrintPreviewHandler::GetInitiatorTab() const {
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   if (!tab_controller)
     return NULL;
   return tab_controller->GetInitiatorTab(preview_web_contents());
@@ -937,8 +937,8 @@ void PrintPreviewHandler::ClearInitiatorTabDetails() {
   // We no longer require the initiator tab details. Remove those details
   // associated with the preview tab to allow the initiator tab to create
   // another preview tab.
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   if (tab_controller)
     tab_controller->EraseInitiatorTabInfo(preview_web_contents());
 }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
index 83469a5..bdc0e6f 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ -67,8 +67,8 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(initiator_tab);
 
-    printing::PrintPreviewTabController* controller =
-        printing::PrintPreviewTabController::GetInstance();
+    printing::PrintPreviewDialogController* controller =
+        printing::PrintPreviewDialogController::GetInstance();
     ASSERT_TRUE(controller);
 
     printing::PrintViewManager* print_view_manager =
@@ -137,6 +137,5 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
   PrintPreviewUI* preview_ui_;
 
  private:
-
   WebContents* preview_tab_;
 };
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.h b/chrome/browser/ui/webui/print_preview/print_preview_ui.h
index 1e05a9b..73f0a7b 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.h
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.h
@@ -151,7 +151,7 @@ class PrintPreviewUI : public ConstrainedWebDialogUI {
                            GetLastUsedMarginSettingsCustom);
   FRIEND_TEST_ALL_PREFIXES(PrintPreviewHandlerTest,
                            GetLastUsedMarginSettingsDefault);
-  FRIEND_TEST_ALL_PREFIXES(PrintPreviewTabControllerUnitTest,
+  FRIEND_TEST_ALL_PREFIXES(PrintPreviewDialogControllerUnitTest,
                            TitleAfterReload);
 
   // Returns the Singleton instance of the PrintPreviewDataService.
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index 2161707..d318650 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/printing/print_preview_test.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -70,8 +70,8 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) {
   ASSERT_TRUE(initiator_tab);
   EXPECT_EQ(0U, GetConstrainedWindowCount(initiator_tab));
 
-  printing::PrintPreviewTabController* controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
@@ -124,8 +124,8 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) {
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator_tab);
 
-  printing::PrintPreviewTabController* controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
@@ -185,8 +185,8 @@ TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) {
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(initiator_tab);
 
-  printing::PrintPreviewTabController* controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
@@ -247,8 +247,8 @@ TEST_F(PrintPreviewUIUnitTest, InitiatorTabGetsFocusOnPrintPreviewTabClose) {
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(0, initiator_tester->GetNumberOfFocusCalls());
 
-  printing::PrintPreviewTabController* controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(controller);
 
   printing::PrintViewManager* print_view_manager =
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index 8f87831..9ae134f 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -14,7 +14,7 @@
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/printing/print_preview_tab_controller.h"
+#include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -221,8 +221,8 @@ void WebUIBrowserTest::BrowsePrintPreload(const GURL& browse_to) {
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoopForUI::current())));
 
-  printing::PrintPreviewTabController* tab_controller =
-      printing::PrintPreviewTabController::GetInstance();
+  printing::PrintPreviewDialogController* tab_controller =
+      printing::PrintPreviewDialogController::GetInstance();
   ASSERT_TRUE(tab_controller);
   WebContents* preview_tab = tab_controller->GetPrintPreviewForTab(
       browser()->tab_strip_model()->GetActiveWebContents());