Split out Ash/Aura parts of ChromeNativeAppWindowViews.

chrome/browser/ui/views/apps/chrome_native_app_window_views.h

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.h
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
index 06dd8286551aa8da737147eac9e4206c0fb193cd..685b69b6e327b7263ac05def24e07acd0478cf0c 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
@@ -7,28 +7,16 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "extensions/components/native_app_window/native_app_window_views.h"
-#include "ui/views/context_menu_controller.h"
 
 namespace apps {
 class AppWindowFrameView;
 }
 
-#if defined(USE_ASH)
-namespace ash {
-class ImmersiveFullscreenController;
-}
-#endif
-
 class DesktopKeyboardCapture;
 class ExtensionKeybindingRegistryViews;
 
-namespace views {
-class MenuRunner;
-}
-
 class ChromeNativeAppWindowViews
-    : public native_app_window::NativeAppWindowViews,
-      public views::ContextMenuController {
+    : public native_app_window::NativeAppWindowViews {
  public:
   ChromeNativeAppWindowViews();
   ~ChromeNativeAppWindowViews() override;
@@ -36,27 +24,29 @@ class ChromeNativeAppWindowViews
   SkRegion* shape() { return shape_.get(); }
 
  protected:
-  // Called before views::Widget::Init() to allow subclasses to customize
-  // the InitParams that would be passed.
-  virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
-                                  views::Widget* widget);
+  // Called before views::Widget::Init() in InitializeDefaultWindow() to allow
+  // subclasses to customize the InitParams that would be passed.
+  virtual void OnBeforeWidgetInit(
+      const extensions::AppWindow::CreateParams& create_params,
+      views::Widget::InitParams* init_params,
+      views::Widget* widget);
+  // Called before views::Widget::Init() in InitializeDefaultWindow() to allow
+  // subclasses to customize the InitParams that would be passed.
+  virtual void OnBeforePanelWidgetInit(views::Widget::InitParams* init_params,
+                                       views::Widget* widget);
 
   virtual void InitializeDefaultWindow(
       const extensions::AppWindow::CreateParams& create_params);
   virtual void InitializePanelWindow(
       const extensions::AppWindow::CreateParams& create_params);
   virtual views::NonClientFrameView* CreateStandardDesktopAppFrame();
+  virtual apps::AppWindowFrameView* CreateNonStandardAppFrame();
 
   // ui::BaseWindow implementation.
   gfx::Rect GetRestoredBounds() const override;
   ui::WindowShowState GetRestoredState() const override;
   bool IsAlwaysOnTop() const override;
 
-  // Overridden from views::ContextMenuController:
-  void ShowContextMenuForView(views::View* source,
-                              const gfx::Point& p,
-                              ui::MenuSourceType source_type) override;
-
   // WidgetDelegate implementation.
   gfx::ImageSkia GetWindowAppIcon() override;
   gfx::ImageSkia GetWindowIcon() override;
@@ -85,11 +75,6 @@ class ChromeNativeAppWindowViews
       const extensions::AppWindow::CreateParams& create_params) override;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest,
-                           ResizeInsetsWithinBounds);
-
-  apps::AppWindowFrameView* CreateNonStandardAppFrame();
-
   // True if the window is fullscreen or fullscreen is pending.
   bool is_fullscreen_;
 
@@ -105,18 +90,6 @@ class ChromeNativeAppWindowViews
   // The class that registers for keyboard shortcuts for extension commands.
   scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
 
-#if defined(USE_ASH)
-  // Used to put non-frameless windows into immersive fullscreen on ChromeOS. In
-  // immersive fullscreen, the window header (title bar and window controls)
-  // slides onscreen as an overlay when the mouse is hovered at the top of the
-  // screen.
-  scoped_ptr<ash::ImmersiveFullscreenController>
-      immersive_fullscreen_controller_;
-#endif  // defined(USE_ASH)
-
-  // Used to show the system menu.
-  scoped_ptr<views::MenuRunner> menu_runner_;
-
   // Used to capture all keyboard events including task switching sequence.
   scoped_ptr<DesktopKeyboardCapture> desktop_keyboard_capture_;