Make packaged apps use AppNonClientFrameViewAsh when maximized

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

Index: chrome/browser/ui/views/frame/app_non_client_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_non_client_frame_view_ash.h
index 4c60d943c62791b47368647470681c66fbbb95f7..8e001a8691549461d6f1e63fb9bd502e414fd156 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h
+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h
@@ -6,24 +6,22 @@
 #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_NON_CLIENT_FRAME_VIEW_ASH_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
+#include "ui/views/window/non_client_view.h"
 
-namespace aura {
-class Window;
+namespace ash {
+class HideableCaptionButtonContainer;
 }
 
-namespace ash {
-class FrameCaptionButtonContainerView;
+namespace views {
+class Widget;
 }
 
-// NonClientFrameViewAsh implementation for maximized apps.
-class AppNonClientFrameViewAsh : public BrowserNonClientFrameView {
+// NonClientFrameView implementation for maximized apps.
+class AppNonClientFrameViewAsh : public views::NonClientFrameView {

[James Cook, 2013/10/02 21:07:55]

Dumb question - remind me why we need both AppNonClientFrameViewAsh and
AppBrowserFrameViewAsh ?

[pkotwicz, 2013/10/03 20:45:35]

Answer: Mostly to make me happy.

- I feel uneasy about using AppBrowserFrameViewAsh in the NativeAppWindowViews
case and passing a NULL BrowserView to AppBrowserFrameViewAsh.
- I cannot return a views::NonClientFrameView* from
chrome::CreateBrowserNonClientFrameView() because BrowserFrame relies on the
return value being a BrowserNonClientFrameView so that it can query things like
BrowserNonClientFrameView::GetTabStripInsets().

  public:
   static const char kViewClassName[];  // visible for test
-  static const char kControlWindowName[];  // visible for test
 
-  AppNonClientFrameViewAsh(
-      BrowserFrame* frame, BrowserView* browser_view);
+  explicit AppNonClientFrameViewAsh(views::Widget* frame);
   virtual ~AppNonClientFrameViewAsh();
 
   // NonClientFrameView:
@@ -38,31 +36,11 @@ class AppNonClientFrameViewAsh : public BrowserNonClientFrameView {
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
 
-  // BrowserNonClientFrameView:
-  virtual gfx::Rect GetBoundsForTabStrip(
-      views::View* tabstrip) const OVERRIDE;
-  virtual TabStripInsets GetTabStripInsets(bool restored) const OVERRIDE;
-  virtual int GetThemeBackgroundXInset() const OVERRIDE;
-  virtual void UpdateThrobber(bool running) OVERRIDE;
-
   // 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);
 };