Move ShellWindow into apps component.

apps/shell_window.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_UI_EXTENSIONS_SHELL_WINDOW_H_
 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
+#include "components/web_modal/web_contents_modal_dialog_manager_delegate.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/common/console_message_level.h"
 #include "ui/base/ui_base_types.h"  // WindowShowState
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class Profile;
 class NativeAppWindow;
 class SkRegion;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 class PlatformAppBrowserTest;
 class WindowController;
 
 struct DraggableRegion;
 }
 
 namespace ui {
 class BaseWindow;
 }
 
+namespace apps {
+
 // Manages the web contents for Shell Windows. The implementation for this
 // class should create and maintain the WebContents for the window, and handle
 // any message passing between the web contents and the extension system or
 // native window.
 class ShellWindowContents {
  public:
   ShellWindowContents() {}
   virtual ~ShellWindowContents() {}
 
   // Called to initialize the WebContents, before the app window is created.
@@ skipping 11 matching lines @@
   virtual content::WebContents* GetWebContents() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellWindowContents);
 };
 
 // ShellWindow is the type of window used by platform apps. Shell windows
 // have a WebContents but none of the chrome of normal browser windows.
 class ShellWindow : public content::NotificationObserver,
                     public content::WebContentsDelegate,
-                    public extensions::ExtensionKeybindingRegistry::Delegate,
-                    public ChromeWebModalDialogManagerDelegate {
+                    public web_modal::WebContentsModalDialogManagerDelegate,
+                    public extensions::ExtensionKeybindingRegistry::Delegate {
  public:
   enum WindowType {
     WINDOW_TYPE_DEFAULT  = 1 << 0,  // Default shell window.
     WINDOW_TYPE_PANEL    = 1 << 1,  // OS controlled panel window (Ash only).
     WINDOW_TYPE_V1_PANEL = 1 << 2,  // For apps v1 support in Ash; deprecate
                                     // with v1 apps.
   };
 
   enum Frame {
     FRAME_CHROME,  // Chrome-style window frame.
@@ skipping 28 matching lines @@
     // If true, don't show the window after creation.
     bool hidden;
 
     // If true, the window will be resizable by the user. Defaults to true.
     bool resizable;
 
     // If true, the window will be focused on creation. Defaults to true.
     bool focused;
   };
 
+  class Delegate {
+   public:
+    virtual ~Delegate();
+
+    // General initialization.
+    virtual void InitWebContents(content::WebContents* web_contents) = 0;
+
+    // Link handling.
+    virtual content::WebContents* OpenURLFromTab(
+        Profile* profile,
+        content::WebContents* source,
+        const content::OpenURLParams& params) = 0;
+    virtual void AddNewContents(Profile* profile,
+                                content::WebContents* new_contents,
+                                WindowOpenDisposition disposition,
+                                const gfx::Rect& initial_pos,
+                                bool user_gesture,
+                                bool* was_blocked) = 0;
+
+    // Feature support.
+    virtual content::ColorChooser* ShowColorChooser(
+        content::WebContents* web_contents,
+        SkColor initial_color) = 0;
+    virtual void RunFileChooser(content::WebContents* tab,
+                                const content::FileChooserParams& params) = 0;
+    virtual void RequestMediaAccessPermission(
+        content::WebContents* web_contents,
+        const content::MediaStreamRequest& request,
+        const content::MediaResponseCallback& callback,
+      const extensions::Extension* extension) = 0;
+    virtual int PreferredIconSize() = 0;
+
+    // Web contents modal dialog support.
+    virtual void SetWebContentsBlocked(content::WebContents* web_contents,
+                                       bool blocked) = 0;
+    virtual bool IsWebContentsVisible(content::WebContents* web_contents) = 0;
+  };
+
   // Helper function for creating and intiailizing a v2 app window.
+  // The created shell window will take ownership of |delegate|.
   static ShellWindow* Create(Profile* profile,
+                             Delegate* delegate,
                              const extensions::Extension* extension,
                              const GURL& url,
                              const CreateParams& params);
 
   // Convert draggable regions in raw format to SkRegion format. Caller is
   // responsible for deleting the returned SkRegion instance.
   static SkRegion* RawDraggableRegionsToSkRegion(
       const std::vector<extensions::DraggableRegion>& regions);
 
   // The constructor and Init methods are public for constructing a ShellWindow
   // with a non-standard render interface (e.g. v1 apps using Ash Panels).
   // Normally ShellWindow::Create should be used.
-  ShellWindow(Profile* profile, const extensions::Extension* extension);
+  // The constructed shell window takes ownership of |delegate|.
+  ShellWindow(Profile* profile,
+              Delegate* delegate,
+              const extensions::Extension* extension);
 
   // Initializes the render interface, web contents, and native window.
   // |shell_window_contents| will become owned by ShellWindow.
   void Init(const GURL& url,
             ShellWindowContents* shell_window_contents,
             const CreateParams& params);
 
 
   const std::string& window_key() const { return window_key_; }
   const SessionID& session_id() const { return session_id_; }
@@ skipping 49 matching lines @@
   // on chrome.app.window API.
   void Fullscreen();
   void Maximize();
   void Minimize();
   void Restore();
 
   ShellWindowContents* shell_window_contents_for_test() {
     return shell_window_contents_.get();
   }
 
-  static void DisableExternalOpenForTesting();
-
  protected:
   virtual ~ShellWindow();
 
  private:
   // PlatformAppBrowserTest needs access to web_contents()
   friend class extensions::PlatformAppBrowserTest;
 
   // content::WebContentsDelegate implementation.
   virtual void CloseContents(content::WebContents* contents) OVERRIDE;
   virtual bool ShouldSuppressDialogs() OVERRIDE;
@@ skipping 30 matching lines @@
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual void RequestToLockMouse(content::WebContents* web_contents,
                                   bool user_gesture,
                                   bool last_unlocked_by_target) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // web_modal::WebContentsModalDialogManagerDelegate implementation.
+  virtual void SetWebContentsBlocked(content::WebContents* web_contents,
+                                     bool blocked) OVERRIDE;
+  virtual bool IsWebContentsVisible(
+      content::WebContents* web_contents) OVERRIDE;
+
   // Helper method to add a message to the renderer's DevTools console.
   void AddMessageToDevToolsConsole(content::ConsoleMessageLevel level,
                                    const std::string& message);
 
   // Saves the window geometry/position.
   void SaveWindowPosition();
 
   // Load the app's image, firing a load state change when loaded.
   void UpdateExtensionAppIcon();
 
@@ skipping 29 matching lines @@
 
   // Icon shown in the task bar.
   gfx::Image app_icon_;
 
   // Icon URL to be used for setting the app icon. If not empty, app_icon_ will
   // be fetched and set using this URL.
   GURL app_icon_url_;
 
   scoped_ptr<NativeAppWindow> native_app_window_;
   scoped_ptr<ShellWindowContents> shell_window_contents_;
+  scoped_ptr<Delegate> delegate_;
 
   base::WeakPtrFactory<ShellWindow> image_loader_ptr_factory_;
 
   // Fullscreen entered by app.window api.
   bool fullscreen_for_window_api_;
   // Fullscreen entered by HTML requestFullscreen.
   bool fullscreen_for_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
+}  // namespace apps
+
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_