Extract UI dependencies from ExtensionHost, part 3

chrome/browser/extensions/extension_host.h

Index: chrome/browser/extensions/extension_host.h
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 9222d159cd5e5a95ddf0999fb18c7112df78bb15..be6881ce7c41e9efcb6e6cc75400f52eb5625bc7 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -20,11 +20,6 @@
 #include "extensions/common/stack_frame.h"
 #include "extensions/common/view_type.h"
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
-#include "components/web_modal/web_contents_modal_dialog_host.h"
-#endif
-
 class PrefsTabHelper;
 
 namespace content {
@@ -42,13 +37,7 @@ class WindowController;
 // It handles setting up the renderer process, if needed, with special
 // privileges available to extensions.  It may have a view to be shown in the
 // browser UI, or it may be hidden.
-// TODO(jamescook): Move the ChromeWebModalDialogManagerDelegate interface to
-// ExtensionViewHost.
 class ExtensionHost : public content::WebContentsDelegate,
-#if !defined(OS_ANDROID)
-                      public ChromeWebModalDialogManagerDelegate,
-                      public web_modal::WebContentsModalDialogHost,
-#endif
                       public content::WebContentsObserver,
                       public ExtensionFunctionDispatcher::Delegate,
                       public content::NotificationObserver {
@@ -128,6 +117,8 @@ class ExtensionHost : public content::WebContentsDelegate,
                        const content::NotificationDetails& details) OVERRIDE;
 
  protected:
+  content::NotificationRegistrar* registrar() { return &registrar_; }
+
   // Called after the extension page finishes loading but before the
   // EXTENSION_HOST_DID_STOP_LOADING notification is sent.
   virtual void OnDidStopLoading();
@@ -135,6 +126,9 @@ class ExtensionHost : public content::WebContentsDelegate,
   // Called once when the document first becomes available.
   virtual void OnDocumentAvailable();
 
+  // Navigates to the initial page.
+  virtual void LoadInitialURL();
+
   // Returns true if we're hosting a background page.
   virtual bool IsBackgroundPage() const;
 
@@ -147,25 +141,6 @@ class ExtensionHost : public content::WebContentsDelegate,
   // Actually create the RenderView for this host. See CreateRenderViewSoon.
   void CreateRenderViewNow();
 
-  // Navigates to the initial page.
-  void LoadInitialURL();
-
-#if !defined(OS_ANDROID)
-  // TODO(jamescook): Move this to ExtensionViewHost.
-  // ChromeWebModalDialogManagerDelegate
-  virtual web_modal::WebContentsModalDialogHost*
-      GetWebContentsModalDialogHost() OVERRIDE;
-
-  // web_modal::WebContentsModalDialogHost
-  virtual gfx::NativeView GetHostView() const OVERRIDE;
-  virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
-  virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
-  virtual void AddObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
-#endif
-
   // Message handlers.
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
   void OnEventAck();