Make packaged apps use AppNonClientFrameViewAsh when maximized

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

Index: chrome/browser/ui/views/frame/app_browser_frame_view_ash.h
diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/app_browser_frame_view_ash.h
similarity index 55%
copy from chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h
copy to chrome/browser/ui/views/frame/app_browser_frame_view_ash.h
index 4c60d943c62791b47368647470681c66fbbb95f7..febccc727e8d983fc8417b406c08f94896e29096 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h
+++ b/chrome/browser/ui/views/frame/app_browser_frame_view_ash.h
@@ -2,29 +2,24 @@
 // 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_FRAME_APP_NON_CLIENT_FRAME_VIEW_ASH_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_ASH_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_APP_BROWSER_FRAME_VIEW_ASH_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_APP_BROWSER_FRAME_VIEW_ASH_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 
-namespace aura {
-class Window;
-}
-
 namespace ash {
-class FrameCaptionButtonContainerView;
+class HideableCaptionButtonContainer;
 }
 
-// NonClientFrameViewAsh implementation for maximized apps.
-class AppNonClientFrameViewAsh : public BrowserNonClientFrameView {
+// BrowserNonClientFrameView implementation for maximized apps.
+class AppBrowserFrameViewAsh : public BrowserNonClientFrameView {
  public:
   static const char kViewClassName[];  // visible for test
-  static const char kControlWindowName[];  // visible for test
 
-  AppNonClientFrameViewAsh(
+  AppBrowserFrameViewAsh(
       BrowserFrame* frame, BrowserView* browser_view);
-  virtual ~AppNonClientFrameViewAsh();
+  virtual ~AppBrowserFrameViewAsh();
 
   // NonClientFrameView:
   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
@@ -47,24 +42,11 @@ class AppNonClientFrameViewAsh : public BrowserNonClientFrameView {
 
   // views::View:
   virtual const char* GetClassName() const OVERRIDE;
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
  private:
-  class FrameObserver;
-
-  gfx::Rect GetControlBounds() const;
-
-  // Closes |control_widget_|.
-  void CloseControlWidget();
-
-  // The View containing the restore and close buttons.
-  ash::FrameCaptionButtonContainerView* control_view_;
-  // The widget holding the control_view_.
-  views::Widget* control_widget_;
-  // Observer for browser frame close.
-  scoped_ptr<FrameObserver> frame_observer_;
+  scoped_ptr<ash::HideableCaptionButtonContainer> container_;
 
-  DISALLOW_COPY_AND_ASSIGN(AppNonClientFrameViewAsh);
+  DISALLOW_COPY_AND_ASSIGN(AppBrowserFrameViewAsh);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_ASH_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_APP_BROWSER_FRAME_VIEW_ASH_H_