Refactor ShellWindow to separate platform-specific code.

chrome/browser/ui/views/extensions/shell_window_views.h

Index: chrome/browser/ui/views/extensions/shell_window_views.h
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.h b/chrome/browser/ui/views/extensions/shell_window_views.h
index 16fdaf224d229800a0e637bd8d064e9e9d03a99c..2575857af7bbd0c74bf6a77f5be7fab53a50567c 100644
--- a/chrome/browser/ui/views/extensions/shell_window_views.h
+++ b/chrome/browser/ui/views/extensions/shell_window_views.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
 
+#include "chrome/browser/ui/base_window.h"
+#include "chrome/browser/ui/extensions/native_shell_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_sk_region.h"
@@ -12,6 +14,10 @@
 
 class Profile;
 
+namespace content {
+class WebContents;
+}
+
 namespace extensions {
 class Extension;
 struct DraggableRegion;
@@ -21,13 +27,11 @@ namespace views {
 class WebView;
 }
 
-class ShellWindowViews : public ShellWindow,
+class ShellWindowViews : public NativeShellWindow,
                          public views::WidgetDelegateView {
  public:
-  ShellWindowViews(Profile* profile,
-                   const extensions::Extension* extension,
-                   const GURL& url,
-                   const CreateParams& params);
+  ShellWindowViews(ShellWindow* shell_window,
+                   const ShellWindow::CreateParams& params);
 
   bool frameless() const { return frameless_; }
   SkRegion* draggable_region() { return draggable_region_.Get(); }
@@ -73,11 +77,19 @@ class ShellWindowViews : public ShellWindow,
   virtual gfx::Size GetMaximumSize() OVERRIDE;
   virtual void OnFocus() OVERRIDE;
 
-  // ShellWindow implementation.
+  // NativeShellWindow implementation.
   virtual void UpdateWindowTitle() OVERRIDE;
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;
   virtual bool IsFullscreenOrPending() const OVERRIDE;
 
+  virtual Profile* profile() { return shell_window_->profile(); }
+  virtual content::WebContents* web_contents() {

[tfarina, 2012/08/09 16:20:20]

Does these needs to be virtual? In any case, virtual functions should be named
CamelCase (e.g., GetWebContents). unix_hacker style is for inlined trivial
methods. 

[jeremya, 2012/08/09 23:59:53]

Not really :)

+    return shell_window_->web_contents();
+  }
+  virtual const extensions::Extension* extension() {
+    return shell_window_->extension();
+  }
+
  private:
   friend class ShellWindowFrameView;
 
@@ -99,6 +111,8 @@ class ShellWindowViews : public ShellWindow,
   gfx::Size minimum_size_;
   gfx::Size maximum_size_;
 
+  ShellWindow* shell_window_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellWindowViews);
 };