Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs

chrome/browser/printing/print_preview_tab_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_tab_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
-#include "chrome/browser/ui/webui/web_dialog_ui.h"
+#include "chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.h"

[mazda, 2012/05/03 22:56:22]

Please sort alphabetically by running tools/sort-headers.py.

+#include "ui/web_dialogs/web_dialog_ui.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 12 matching lines @@
   // Always enable the internal PDF plugin for the print preview page.
   ChromePluginServiceFilter::GetInstance()->OverridePluginForTab(
         preview_tab->web_contents()->GetRenderProcessHost()->GetID(),
         preview_tab->web_contents()->GetRenderViewHost()->GetRoutingID(),
         GURL(),
         ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
 }
 
 // WebDialogDelegate that specifies what the print preview dialog
 // will look like.
-class PrintPreviewTabDelegate : public WebDialogDelegate {
+class PrintPreviewTabDelegate : public views::WebDialogDelegate {
  public:
   explicit PrintPreviewTabDelegate(TabContentsWrapper* initiator_tab);
   virtual ~PrintPreviewTabDelegate();
 
   // Overridden from WebDialogDelegate:
   virtual ui::ModalType GetDialogModalType() const OVERRIDE;
   virtual string16 GetDialogTitle() const OVERRIDE;
   virtual GURL GetDialogContentURL() const OVERRIDE;
   virtual void GetWebUIMessageHandlers(
       std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
@@ skipping 71 matching lines @@
 }
 
 bool PrintPreviewTabDelegate::ShouldShowDialogTitle() const {
   // Not used, returning dummy value.
   NOTREACHED();
   return false;
 }
 
 // WebContentsDelegate that forwards shortcut keys in the print preview
 // renderer to the browser.
-class PrintPreviewWebContentDelegate : public WebDialogWebContentsDelegate {
+class PrintPreviewWebContentDelegate
+    : public ChromeWebDialogWebContentsDelegate {
  public:
   PrintPreviewWebContentDelegate(Profile* profile,
                                  TabContentsWrapper* initiator_tab);
   virtual ~PrintPreviewWebContentDelegate();
 
   virtual bool CanReloadContents(WebContents* source) const OVERRIDE;
   virtual void HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) OVERRIDE;
 
  private:
   TabContentsWrapper* tab_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewWebContentDelegate);
 };
 
 PrintPreviewWebContentDelegate::PrintPreviewWebContentDelegate(
     Profile* profile,
     TabContentsWrapper* initiator_tab)
-    : WebDialogWebContentsDelegate(profile),
+    : ChromeWebDialogWebContentsDelegate(profile),
       tab_(initiator_tab) {}
 
 PrintPreviewWebContentDelegate::~PrintPreviewWebContentDelegate() {}
 
 bool PrintPreviewWebContentDelegate::CanReloadContents(
     WebContents* source) const {
   return false;
 }
 
 void PrintPreviewWebContentDelegate::HandleKeyboardEvent(
@@ skipping 239 matching lines @@
         NOTREACHED() << "Failed to create popup browser window";
         return NULL;
       }
     } else {
       return NULL;
     }
   }
 
   // |web_dialog_ui_delegate| deletes itself in
   // PrintPreviewTabDelegate::OnDialogClosed().
-  WebDialogDelegate* web_dialog_delegate =
+  views::WebDialogDelegate* web_dialog_delegate =
       new PrintPreviewTabDelegate(initiator_tab);
   // |web_tab_content_delegate|'s owner is |constrained_web_ui_delegate|.
   PrintPreviewWebContentDelegate* pp_wcd =
       new PrintPreviewWebContentDelegate(current_browser->profile(),
                                          initiator_tab);
   ConstrainedWebDialogDelegate* constrained_delegate =
       ConstrainedWebDialogUI::CreateConstrainedWebDialog(
           current_browser->profile(),
           web_dialog_delegate,
           pp_wcd,
@@ skipping 99 matching lines @@
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->web_contents()->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnTabDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing