Start untangling the avatar switcher from BrowserNonClientFrameView

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/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/tab_icon_view_model.h"
-#include "ui/views/controls/button/button.h"
 
 class TabIconView;
 class WebAppLeftHeaderView;
 
 namespace ash {
 class FrameBorderHitTestController;
 class FrameCaptionButton;
 class FrameCaptionButtonContainerView;
 class HeaderPainter;
 }
 
 namespace views {
 class ImageButton;
 class ToggleImageButton;
 }
 
 class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
                                      public ash::ShellObserver,
-                                     public TabIconViewModel,
-                                     public views::ButtonListener {
+                                     public TabIconViewModel {
  public:
   static const char kViewClassName[];
 
   BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view);
   ~BrowserNonClientFrameViewAsh() override;
 
   void Init();
 
   // BrowserNonClientFrameView:
   gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
@@ skipping 23 matching lines @@
   void ChildPreferredSizeChanged(views::View* child) override;
 
   // ash::ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
   // TabIconViewModel:
   bool ShouldTabIconViewAnimate() const override;
   gfx::ImageSkia GetFaviconForTabIconView() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
  protected:
   // BrowserNonClientFrameView:
   void UpdateNewAvatarButtonImpl() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader);
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
                            NonImmersiveFullscreen);
   FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
                            ImmersiveFullscreen);
@@ skipping 23 matching lines @@
   // 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 avatar button.
   void LayoutAvatar();
-#if defined(FRAME_AVATAR_BUTTON)
-  void LayoutNewStyleAvatar();
-#endif
 
   // 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);
@@ skipping 16 matching lines @@
   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_