Fix a crash on WebViewFocusHelper destruction.

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>
 
 #include "base/auto_reset.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/printing/print_view_manager.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "components/web_modal/web_contents_modal_dialog_host.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/plugin_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/webplugininfo.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
-#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
 
-using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::WebContents;
 using content::WebUIMessageHandler;
-using ui::WebDialogDelegate;
-using ui::WebDialogWebContentsDelegate;
 
 namespace {
 
 void EnableInternalPDFPluginForContents(WebContents* preview_dialog) {
   // Always enable the internal PDF plugin for the print preview page.
   base::FilePath pdf_plugin_path;
   if (!PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_plugin_path))
     return;
 
   content::WebPluginInfo pdf_plugin;
   if (!content::PluginService::GetInstance()->GetPluginInfoByPath(
       pdf_plugin_path, &pdf_plugin))
     return;
 
   ChromePluginServiceFilter::GetInstance()->OverridePluginForFrame(
       preview_dialog->GetRenderProcessHost()->GetID(),
       preview_dialog->GetMainFrame()->GetRoutingID(),
       GURL(), pdf_plugin);
 }
 
-// WebDialogDelegate that specifies what the print preview dialog
-// will look like.
-class PrintPreviewDialogDelegate : public WebDialogDelegate {
+// A ui::WebDialogDelegate that specifies the print preview dialog appearance.
+class PrintPreviewDialogDelegate : public ui::WebDialogDelegate {
  public:
   explicit PrintPreviewDialogDelegate(WebContents* initiator);
   virtual ~PrintPreviewDialogDelegate();
 
   virtual ui::ModalType GetDialogModalType() const OVERRIDE;
   virtual base::string16 GetDialogTitle() const OVERRIDE;
   virtual GURL GetDialogContentURL() const OVERRIDE;
   virtual void GetWebUIMessageHandlers(
       std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
   virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
@@ skipping 74 matching lines @@
 void PrintPreviewDialogDelegate::OnCloseContents(WebContents* /* source */,
                                                  bool* out_close_dialog) {
   if (out_close_dialog)
     *out_close_dialog = true;
 }
 
 bool PrintPreviewDialogDelegate::ShouldShowDialogTitle() const {
   return false;
 }
 
-// WebContentsDelegate that forwards shortcut keys in the print preview
-// renderer to the browser.
-class PrintPreviewWebContentDelegate : public WebDialogWebContentsDelegate {
- public:
-  PrintPreviewWebContentDelegate(Profile* profile, WebContents* initiator);
-  virtual ~PrintPreviewWebContentDelegate();
-
-  // Overridden from WebDialogWebContentsDelegate:
-  virtual void HandleKeyboardEvent(
-      WebContents* source,
-      const NativeWebKeyboardEvent& event) OVERRIDE;
-
- private:
-  WebContents* initiator_;
-
-  DISALLOW_COPY_AND_ASSIGN(PrintPreviewWebContentDelegate);
-};
-
-PrintPreviewWebContentDelegate::PrintPreviewWebContentDelegate(
-    Profile* profile,
-    WebContents* initiator)
-    : WebDialogWebContentsDelegate(profile, new ChromeWebContentsHandler),
-      initiator_(initiator) {}
-
-PrintPreviewWebContentDelegate::~PrintPreviewWebContentDelegate() {}
-
-void PrintPreviewWebContentDelegate::HandleKeyboardEvent(
-    WebContents* source,
-    const NativeWebKeyboardEvent& event) {
-  // Disabled on Mac due to http://crbug.com/112173
-#if !defined(OS_MACOSX)
-  Browser* current_browser = chrome::FindBrowserWithWebContents(initiator_);
-  if (!current_browser)
-    return;
-  current_browser->window()->HandleKeyboardEvent(event);
-#endif
-}
-
 }  // namespace
 
 namespace printing {
 
 PrintPreviewDialogController::PrintPreviewDialogController()
     : waiting_for_new_preview_page_(false),
       is_creating_print_preview_dialog_(false) {
 }
 
 // static
@@ skipping 187 matching lines @@
     NOTREACHED();
     return;
   }
 
   RemoveInitiator(contents);
 }
 
 WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
     WebContents* initiator) {
   base::AutoReset<bool> auto_reset(&is_creating_print_preview_dialog_, true);
-  Profile* profile =
-      Profile::FromBrowserContext(initiator->GetBrowserContext());
 
-  // |web_dialog_ui_delegate| deletes itself in
-  // PrintPreviewDialogDelegate::OnDialogClosed().
-  WebDialogDelegate* web_dialog_delegate =
-      new PrintPreviewDialogDelegate(initiator);
-  // |web_dialog_delegate|'s owner is |constrained_delegate|.
-  PrintPreviewWebContentDelegate* pp_wcd =
-      new PrintPreviewWebContentDelegate(profile, initiator);
-  ConstrainedWebDialogDelegate* constrained_delegate =
-      CreateConstrainedWebDialog(profile,
-                                 web_dialog_delegate,
-                                 pp_wcd,
+  // The dialog delegates are deleted when the dialog is closed.
+  ConstrainedWebDialogDelegate* web_dialog_delegate =
+      CreateConstrainedWebDialog(initiator->GetBrowserContext(),
+                                 new PrintPreviewDialogDelegate(initiator),
                                  initiator);
-  WebContents* preview_dialog = constrained_delegate->GetWebContents();
+
+  WebContents* preview_dialog = web_dialog_delegate->GetWebContents();
   EnableInternalPDFPluginForContents(preview_dialog);
   PrintViewManager::CreateForWebContents(preview_dialog);
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       preview_dialog);
 
   // Add an entry to the map.
   preview_dialog_map_[preview_dialog] = initiator;
   waiting_for_new_preview_page_ = true;
 
   AddObservers(initiator);
@@ skipping 84 matching lines @@
         static_cast<PrintPreviewUI*>(web_ui->GetController());
     if (print_preview_ui)
       print_preview_ui->OnPrintPreviewDialogDestroyed();
   }
 
   preview_dialog_map_.erase(preview_dialog);
   RemoveObservers(preview_dialog);
 }
 
 }  // namespace printing