Introduce new WebApp header style for hosted apps and fizzy apps on ash.

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 
 #include "ash/shell_observer.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/browser/command_observer.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/tab_icon_view_model.h"
 
 class TabIconView;
 
 namespace ash {
 class FrameBorderHitTestController;
+class FrameCaptionButton;
 class FrameCaptionButtonContainerView;
 class HeaderPainter;
 }
 namespace views {
 class ImageButton;
 class ToggleImageButton;
 }
 
-class BrowserNonClientFrameViewAsh
-    : public BrowserNonClientFrameView,
-      public ash::ShellObserver,
-      public chrome::TabIconViewModel {
+class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
+                                     public ash::ShellObserver,
+                                     public chrome::TabIconViewModel,
+                                     public CommandObserver,
+                                     public views::ButtonListener {

[pkotwicz, 2014/08/14 01:59:44]

Shouldn't we be including ui/views/controls/button/button.h

[benwells, 2014/08/14 04:42:50]

Done.

  public:
   static const char kViewClassName[];
 
   BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view);
   virtual ~BrowserNonClientFrameViewAsh();
 
   void Init();
 
   // BrowserNonClientFrameView:
   virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
@@ skipping 21 matching lines @@
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
 
   // ash::ShellObserver:
   virtual void OnMaximizeModeStarted() OVERRIDE;
   virtual void OnMaximizeModeEnded() OVERRIDE;
 
   // chrome::TabIconViewModel:
   virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
   virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
 
+  // CommandObserver:
+  virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
+
+  // views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender,
+                             const ui::Event& event) OVERRIDE;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader);
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
                            NonImmersiveFullscreen);
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
                            ImmersiveFullscreen);
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
                            ToggleMaximizeModeRelayout);
 
   // views::NonClientFrameView:
@@ skipping 10 matching lines @@
   // Returns true if we should use a super short header with light bars instead
   // of regular tabs. This header is used in immersive fullscreen when the
   // top-of-window views are not revealed.
   bool UseImmersiveLightbarHeaderStyle() const;
 
   // Returns true if the header should be painted so that it looks the same as
   // the header used for packaged apps. Packaged apps use a different color
   // scheme than browser windows.
   bool UsePackagedAppHeaderStyle() const;
 
+  // Returns true if the header should be painted with a WebApp header style.
+  // The WebApp header style has a back button and title along with the usual
+  // accoutrements.
+  bool UseWebAppHeaderStyle() const;
+
   // Layout the incognito icon.
   void LayoutAvatar();
 
   // Returns true if there is anything to paint. Some fullscreen windows do not
   // need their frames painted.
   bool ShouldPaint() const;
 
   // Paints the header background when the frame is in immersive fullscreen and
   // tab light bar is visible.
   void PaintImmersiveLightbarStyleHeader(gfx::Canvas* canvas);
 
   void PaintToolbarBackground(gfx::Canvas* canvas);
 
   // Draws the line under the header for windows without a toolbar and not using
   // the packaged app header style.
   void PaintContentEdge(gfx::Canvas* canvas);
 
+  // Update the state of the back button.
+  void UpdateBackButtonState(bool enabled);
+
   // View which contains the window controls.
   ash::FrameCaptionButtonContainerView* caption_button_container_;
 
+  // View which contains the back button for WebApp style header.

[pkotwicz, 2014/08/14 01:59:44]

How about: "The back button for the web app style header."

[benwells, 2014/08/14 04:42:50]

Done.

+  ash::FrameCaptionButton* web_app_back_button_;
+
   // For popups, the window icon.
   TabIconView* window_icon_;
 
   // Helper class for painting the header.
   scoped_ptr<ash::HeaderPainter> header_painter_;
 
   // Updates the hittest bounds overrides based on the window show type.
   scoped_ptr<ash::FrameBorderHitTestController>
       frame_border_hit_test_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_