Extract UI dependencies from ExtensionHost, part 3

chrome/browser/extensions/extension_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #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 {
 class BrowserContext;
 class RenderProcessHost;
 class RenderWidgetHostView;
 class SiteInstance;
 }
 
 namespace extensions {
 class Extension;
 class WindowController;
 
 // This class is the browser component of an extension component's RenderView.
 // 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 {
  public:
   class ProcessCreationQueue;
 
   ExtensionHost(const Extension* extension,
                 content::SiteInstance* site_instance,
                 const GURL& url, ViewType host_type);
   virtual ~ExtensionHost();
@@ skipping 59 matching lines @@
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) OVERRIDE;
 
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        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();
 
   // 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;
 
   // Closes this host (results in deletion).
   void Close();
 
  private:
   friend class ProcessCreationQueue;
 
   // 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();
   void OnIncrementLazyKeepaliveCount();
   void OnDecrementLazyKeepaliveCount();
   void OnDetailedConsoleMessageAdded(
       const base::string16& message,
       const base::string16& source,
       const StackTrace& stack_trace,
       int32 severity_level);
@@ skipping 38 matching lines @@
 
   // Used to measure how long it's been since the host was created.
   base::ElapsedTimer since_created_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHost);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_