Pull shell window stuff out of ExtensionHost and put in ShellWindow

chrome/browser/ui/views/extensions/shell_window_views.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_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
 #pragma once
 
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/views/extensions/extension_view.h"

[jeremya, 2012/05/07 00:54:38]

I don't think we need this any more.

[benwells, 2012/05/07 08:46:15]

Done.

 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_sk_region.h"
+#include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/widget/widget_delegate.h"
 
-class ExtensionHost;
+class Profile;
 
 class ShellWindowViews : public ShellWindow,
-                         public ExtensionView::Container,
-                         public views::WidgetDelegateView {
+                         public views::NativeViewHost,
+                         public views::WidgetDelegate {
  public:
-  explicit ShellWindowViews(ExtensionHost* host);
+  explicit ShellWindowViews(Profile* profile,
+                            const Extension* extension,
+                            const GURL& url);
 
   // BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;
   virtual bool IsMinimized() const OVERRIDE;
   virtual bool IsFullscreen() const OVERRIDE;
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void ShowInactive() OVERRIDE;
@@ skipping 12 matching lines @@
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
 
-  // ExtensionView::Container implementation.
-  virtual void OnViewWasResized() OVERRIDE;
+  // Overridden from views::NativeViewHost:
+  virtual gfx::NativeCursor GetCursor(const views::MouseEvent& event) OVERRIDE;
+  virtual void SetVisible(bool is_visible) OVERRIDE;
+  virtual void ViewHierarchyChanged(
+      bool is_add, views::View *parent, views::View *child) OVERRIDE;
+
+ protected:
+  // Overridden from views::View.
+  virtual void PreferredSizeChanged() OVERRIDE;
+  virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;
+  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
  private:
   virtual ~ShellWindowViews();
 
+  void OnViewWasResized();
+
+  bool initialized_;
   views::Widget* window_;
 
   gfx::ScopedSkRegion caption_region_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_