Make packaged apps use AppNonClientFrameViewAsh when maximized

chrome/browser/ui/views/frame/browser_frame_ash.h

Index: chrome/browser/ui/views/frame/browser_frame_ash.h
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.h b/chrome/browser/ui/views/frame/browser_frame_ash.h
index b184bd61b79a8d3e65aaf5b9b73ef2206f8a4cad..411d91b23d6724db9d02dbf6f984573fc997d7a1 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ash.h
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.h
@@ -12,6 +12,7 @@
 
 class BrowserFrame;
 class BrowserView;
+class NonClientFrameViewSwitcherAsh;
 
 ////////////////////////////////////////////////////////////////////////////////
 //  BrowserFrameAsh
@@ -30,7 +31,6 @@ class BrowserFrameAsh : public views::NativeWidgetAura,
 
  protected:
   // Overridden from views::NativeWidgetAura:
-  virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
 
   // Overridden from NativeBrowserFrame:
@@ -41,8 +41,6 @@ class BrowserFrameAsh : public views::NativeWidgetAura,
   virtual void TabStripDisplayModeChanged() OVERRIDE;
 
  private:
-  class WindowPropertyWatcher;
-
   virtual ~BrowserFrameAsh();
 
   // Set the window into the auto managed mode.
@@ -51,7 +49,9 @@ class BrowserFrameAsh : public views::NativeWidgetAura,
   // The BrowserView is our ClientView. This is a pointer to it.
   BrowserView* browser_view_;
 
-  scoped_ptr<WindowPropertyWatcher> window_property_watcher_;
+  // Used to switch the non client frame view when an app's maximized state is
+  // changed.
+  scoped_ptr<NonClientFrameViewSwitcherAsh> browser_frame_switcher_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameAsh);
 };