Refactor ShellWindow to separate platform-specific code.

chrome/browser/ui/extensions/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 "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/base_window.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 "content/public/common/console_message_level.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class Profile;
 class TabContents;
+class NativeShellWindow;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 class WindowController;
 struct DraggableRegion;
 }
 
 // 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 content::WebContentsObserver,
-                    public ExtensionFunctionDispatcher::Delegate,
-                    public BaseWindow {
+                    public ExtensionFunctionDispatcher::Delegate {
  public:
   struct CreateParams {
     enum Frame {
       FRAME_CHROME, // Chrome-style window frame.
       FRAME_NONE, // Frameless window.
     };
 
     CreateParams();
 
     Frame frame;
     // Specify the initial bounds of the window. If empty, the window will be a
     // default size.
     gfx::Rect bounds;
     gfx::Size minimum_size;
     gfx::Size maximum_size;
   };
 
   static ShellWindow* Create(Profile* profile,
                              const extensions::Extension* extension,
                              const GURL& url,
                              const CreateParams& params);
 
   const SessionID& session_id() const { return session_id_; }
   const extensions::Extension* extension() const { return extension_; }
   const TabContents* tab_contents() const { return contents_.get(); }
   content::WebContents* web_contents() const { return web_contents_; }
+  Profile* profile() const { return profile_; }
 
- protected:
-  ShellWindow(Profile* profile,
-              const extensions::Extension* extension,
-              const GURL& url);
-  virtual ~ShellWindow();
+  BaseWindow* GetBaseWindow();
+  gfx::NativeWindow GetNativeWindow() {
+    return GetBaseWindow()->GetNativeWindow();
+  }
 
-  // Called when the title of the window changes.
-  virtual void UpdateWindowTitle() {}
-  // Sub-classes should call this to determine what the window's title is on
-  // startup and from within UpdateWindowTitle().
+  // NativeShellWindows should call this to determine what the window's title
+  // is on startup and from within UpdateWindowTitle().
   virtual string16 GetTitle() const;
 
-  virtual void SetFullscreen(bool fullscreen) {}
-  virtual bool IsFullscreenOrPending() const;
-
-  // Called when the draggable regions are changed.
-  virtual void UpdateDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) {}
-
   // Call to notify ShellRegistry and delete the window. Subclasses should
   // invoke this method instead of using "delete this".
   void OnNativeClose();
 
+ protected:
+  ShellWindow(Profile* profile,
+              const extensions::Extension* extension);
+  virtual ~ShellWindow();
+
  private:
   // PlatformAppBrowserTest needs access to web_contents()
   friend class PlatformAppBrowserTest;
 
   // Instantiates a platform-specific ShellWindow subclass (one implementation
   // per platform). Public users of ShellWindow should use ShellWindow::Create.
-  static ShellWindow* CreateImpl(Profile* profile,
-                                 const extensions::Extension* extension,
-                                 const GURL& url,
-                                 const CreateParams& params);
+  void Init(const GURL& url, const CreateParams& params);
 
   // content::WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // content::WebContentsDelegate implementation.
   virtual void CloseContents(content::WebContents* contents) OVERRIDE;
   virtual bool ShouldSuppressDialogs() OVERRIDE;
   virtual void WebIntentDispatch(
       content::WebContents* web_contents,
       content::WebIntentsDispatcher* intents_dispatcher) OVERRIDE;
@@ skipping 32 matching lines @@
   virtual extensions::WindowController* GetExtensionWindowController() const
       OVERRIDE;
 
   // Message handlers.
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
 
   // Helper method to add a message to the renderer's DevTools console.
   void AddMessageToDevToolsConsole(content::ConsoleMessageLevel level,
                                    const std::string& message);
 
+  virtual void UpdateDraggableRegions(
+    const std::vector<extensions::DraggableRegion>& regions);
+
   Profile* profile_;  // weak pointer - owned by ProfileManager.
   // weak pointer - owned by ExtensionService.
   const extensions::Extension* extension_;
 
   const SessionID session_id_;
   scoped_ptr<TabContents> contents_;
   // web_contents_ is owned by contents_.
   content::WebContents* web_contents_;
   content::NotificationRegistrar registrar_;
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
+  scoped_ptr<NativeShellWindow> native_window_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_