Start untangling the avatar switcher from BrowserNonClientFrameView

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 
 #include <algorithm>
 
 #include "ash/ash_layout_constants.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 40 matching lines @@
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
 #endif
 
 namespace {
 
-#if defined(FRAME_AVATAR_BUTTON)
-// Space between the new avatar button and the minimize button.
-const int kNewAvatarButtonOffset = 5;
-#endif
 // Space between right edge of tabstrip and maximize button.
 const int kTabstripRightSpacing = 10;
 // Height of the shadow of the content area, at the top of the toolbar.
 const int kContentShadowHeight = 1;
 // Space between top of window and top of tabstrip for tall headers, such as
 // for restored windows, apps, etc.
 const int kTabstripTopSpacingTall = 7;
 // Space between top of window and top of tabstrip for short headers, such as
 // for maximized windows, pop-ups, etc.
 const int kTabstripTopSpacingShort = 0;
@@ skipping 164 matching lines @@
 
 gfx::Rect BrowserNonClientFrameViewAsh::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return client_bounds;
 }
 
 int BrowserNonClientFrameViewAsh::NonClientHitTest(const gfx::Point& point) {
   int hit_test = ash::FrameBorderHitTestController::NonClientHitTest(this,
       caption_button_container_, point);
 
-#if defined(FRAME_AVATAR_BUTTON)
-  if (hit_test == HTCAPTION && new_avatar_button() &&
-      ConvertedHitTest(this, new_avatar_button(), point)) {
-    return HTCLIENT;
-  }
-#endif
-
   // See if the point is actually within the web app back button.
   if (hit_test == HTCAPTION && web_app_left_header_view_ &&
       ConvertedHitTest(this, web_app_left_header_view_, point)) {
     return HTCLIENT;
   }
 
 #if defined(ENABLE_SUPERVISED_USERS)
   // ...or within the avatar label, if it's a supervised user.
   if (hit_test == HTCAPTION && supervised_user_avatar_label() &&
       ConvertedHitTest(this, supervised_user_avatar_label(), point)) {
@@ skipping 83 matching lines @@
     // toolbar because the top few pixels of the toolbar are not opaque.
     const int kToolbarTopEdgeExclusion = 2;
     painted_height += kToolbarTopEdgeExclusion;
   }
   header_painter_->SetHeaderHeightForPainting(painted_height);
 
   if (avatar_button()) {
     LayoutAvatar();
     header_painter_->UpdateLeftViewXInset(avatar_button()->bounds().right());
   }
-#if defined(FRAME_AVATAR_BUTTON)
-  if (new_avatar_button())
-    LayoutNewStyleAvatar();
-#endif
   header_painter_->UpdateLeftViewXInset(
       ash::HeaderPainterUtil::GetDefaultLeftViewXInset());
   BrowserNonClientFrameView::Layout();
 }
 
 const char* BrowserNonClientFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(
@@ skipping 17 matching lines @@
 }
 
 void BrowserNonClientFrameViewAsh::
   ChildPreferredSizeChanged(views::View* child) {
   // FrameCaptionButtonContainerView animates the visibility changes in
   // UpdateSizeButtonVisibility(false). Due to this a new size is not available
   // until the completion of the animation. Layout in response to the preferred
   // size changes.
   if (!browser_view()->initialized())
     return;
-  bool needs_layout = child == caption_button_container_;
-#if defined(FRAME_AVATAR_BUTTON)
-  needs_layout = needs_layout || child == new_avatar_button();
-#endif
-  if (needs_layout) {
+  if (child == caption_button_container_) {
     InvalidateLayout();
     frame()->GetRootView()->Layout();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ash::ShellObserver:
 
 void BrowserNonClientFrameViewAsh::OnMaximizeModeStarted() {
   caption_button_container_->UpdateSizeButtonVisibility();
@@ skipping 21 matching lines @@
 }
 
 gfx::ImageSkia BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {
   views::WidgetDelegate* delegate = frame()->widget_delegate();
   if (!delegate)
     return gfx::ImageSkia();
   return delegate->GetWindowIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// views::ButtonListener:
-
-void BrowserNonClientFrameViewAsh::ButtonPressed(views::Button* sender,
-                                                 const ui::Event& event) {
-#if !defined(FRAME_AVATAR_BUTTON)
-  NOTREACHED();
-#else
-  DCHECK(sender == new_avatar_button());
-  int command = IDC_SHOW_AVATAR_MENU;
-  if (event.IsMouseEvent() &&
-      static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) {
-    command = IDC_SHOW_FAST_USER_SWITCHER;
-  }
-  chrome::ExecuteCommand(browser_view()->browser(), command);
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, protected:
 
 // BrowserNonClientFrameView:
 void BrowserNonClientFrameViewAsh::UpdateNewAvatarButtonImpl() {
-#if defined(FRAME_AVATAR_BUTTON)
-  UpdateNewAvatarButton(this, NewAvatarButton::NATIVE_BUTTON);
-#endif
+  NOTREACHED();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 // views::NonClientFrameView:
 bool BrowserNonClientFrameViewAsh::DoesIntersectRect(
     const views::View* target,
     const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
@@ skipping 26 matching lines @@
   const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
   const int avatar_right = avatar_button() ?
       (insets.left() + browser_view()->GetOTRAvatarIcon().width()) : 0;
   return avatar_right + insets.right();
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripRightInset() const {
   int tabstrip_width = kTabstripRightSpacing +
       caption_button_container_->GetPreferredSize().width();
 
-#if defined(FRAME_AVATAR_BUTTON)
-  if (new_avatar_button()) {
-    tabstrip_width += kNewAvatarButtonOffset +
-         new_avatar_button()->GetPreferredSize().width();
-  }
-#endif
-
   return tabstrip_width;
 }
 
 bool BrowserNonClientFrameViewAsh::UseImmersiveLightbarHeaderStyle() const {
   ImmersiveModeController* immersive_controller =
       browser_view()->immersive_mode_controller();
   return immersive_controller->IsEnabled() &&
       !immersive_controller->IsRevealed() &&
       browser_view()->IsTabStripVisible();
 }
@@ skipping 36 matching lines @@
   // recognizable.
   bool avatar_visible = !UseImmersiveLightbarHeaderStyle();
   int avatar_height = avatar_visible ? avatar_bottom - avatar_y : 0;
 
   gfx::Rect avatar_bounds(avatar_insets.left(), avatar_y,
                           incognito_icon.width(), avatar_height);
   avatar_button()->SetBoundsRect(avatar_bounds);
   avatar_button()->SetVisible(avatar_visible);
 }
 
-#if defined(FRAME_AVATAR_BUTTON)
-void BrowserNonClientFrameViewAsh::LayoutNewStyleAvatar() {
-  DCHECK(new_avatar_button());
-
-  gfx::Size button_size = new_avatar_button()->GetPreferredSize();
-  int button_x = width() -
-      caption_button_container_->GetPreferredSize().width() -
-      kNewAvatarButtonOffset - button_size.width();
-
-  new_avatar_button()->SetBounds(
-      button_x,
-      0,
-      button_size.width(),
-      caption_button_container_->GetPreferredSize().height());
-}
-#endif
-
 bool BrowserNonClientFrameViewAsh::ShouldPaint() const {
   if (!frame()->IsFullscreen())
     return true;
 
   // We need to paint when in immersive fullscreen and either:
   // - The top-of-window views are revealed.
   // - The lightbar style tabstrip is visible.
   ImmersiveModeController* immersive_mode_controller =
       browser_view()->immersive_mode_controller();
   return immersive_mode_controller->IsEnabled() &&
@@ skipping 122 matching lines @@
 }
 
 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   canvas->FillRect(
       gfx::Rect(0, caption_button_container_->bounds().bottom(), width(),
                 kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }