Simplify some old avatar menu button code.

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"
 #include "ash/frame/default_header_painter.h"
 #include "ash/frame/frame_border_hit_test_controller.h"
 #include "ash/frame/header_painter_util.h"
 #include "ash/shell.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/web_app_left_header_view_ash.h"
-#include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
+#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 259 matching lines @@
   // computation of |painted_height| for app and popup windows depends on the
   // position of the window controls.
   header_painter_->LayoutHeader();
 
   int painted_height = GetTopInset(false);
   if (browser_view()->IsTabStripVisible())
     painted_height += browser_view()->tabstrip()->GetPreferredSize().height();
 
   header_painter_->SetHeaderHeightForPainting(painted_height);
 
-  if (avatar_button())
-    LayoutAvatar();
+  if (profile_indicator_icon())
+    LayoutProfileIndicatorIcon();
   BrowserNonClientFrameView::Layout();
 }
 
 const char* BrowserNonClientFrameViewAsh::GetClassName() const {
   return "BrowserNonClientFrameViewAsh";
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_TITLE_BAR;
 }
@@ skipping 53 matching lines @@
 
 gfx::ImageSkia BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {
   views::WidgetDelegate* delegate = frame()->widget_delegate();
   return delegate ? delegate->GetWindowIcon() : gfx::ImageSkia();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, protected:
 
 // BrowserNonClientFrameView:
-void BrowserNonClientFrameViewAsh::UpdateAvatar() {
-  UpdateOldAvatarButton();
+void BrowserNonClientFrameViewAsh::UpdateProfileIcons() {
+  Browser* browser = browser_view()->browser();
+  if ((browser->is_type_tabbed() || browser->is_app()) &&
+      chrome::MultiUserWindowManager::ShouldShowAvatar(
+          browser_view()->GetNativeWindow())) {
+    UpdateProfileIndicatorIcon();
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 // views::NonClientFrameView:
 bool BrowserNonClientFrameViewAsh::DoesIntersectRect(
     const views::View* target,
     const gfx::Rect& rect) const {
   CHECK_EQ(this, target);
@@ skipping 15 matching lines @@
   View::ConvertRectToTarget(this, tabstrip, &rect_in_tabstrip_coords_f);
   const gfx::Rect rect_in_tabstrip_coords(
       gfx::ToEnclosingRect(rect_in_tabstrip_coords_f));
   return (rect_in_tabstrip_coords.y() <= tabstrip->height()) &&
           (!tabstrip->HitTestRect(rect_in_tabstrip_coords) ||
           tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords));
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripLeftInset() const {
   const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
-  const int avatar_right =
-      avatar_button() ? (insets.left() + GetOTRAvatarIcon().width()) : 0;
+  const int avatar_right = profile_indicator_icon()
+                               ? (insets.left() + GetOTRAvatarIcon().width())
+                               : 0;
   return avatar_right + insets.right();
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripRightInset() const {
   return kTabstripRightSpacing +
       caption_button_container_->GetPreferredSize().width();
 }
 
 bool BrowserNonClientFrameViewAsh::UseImmersiveLightbarHeaderStyle() const {
   const ImmersiveModeController* const immersive_controller =
       browser_view()->immersive_mode_controller();
   return immersive_controller->IsEnabled() &&
          !immersive_controller->IsRevealed() &&
          browser_view()->IsTabStripVisible();
 }
 
 bool BrowserNonClientFrameViewAsh::UsePackagedAppHeaderStyle() const {
   // Use for non tabbed trusted source windows, e.g. Settings, as well as apps
   // that aren't using the newer WebApp style.
   const Browser* const browser = browser_view()->browser();
   return (!browser->is_type_tabbed() && browser->is_trusted_source()) ||
          (browser->is_app() && !UseWebAppHeaderStyle());
 }
 
 bool BrowserNonClientFrameViewAsh::UseWebAppHeaderStyle() const {
   return browser_view()->browser()->SupportsWindowFeature(
       Browser::FEATURE_WEBAPPFRAME);
 }
 
-void BrowserNonClientFrameViewAsh::LayoutAvatar() {
-  DCHECK(avatar_button());
+void BrowserNonClientFrameViewAsh::LayoutProfileIndicatorIcon() {
+  DCHECK(profile_indicator_icon());
 #if !defined(OS_CHROMEOS)
   // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
 
   const gfx::ImageSkia incognito_icon = GetOTRAvatarIcon();
   const gfx::Insets avatar_insets = GetLayoutInsets(AVATAR_ICON);
   const int avatar_bottom = GetTopInset(false) +
       browser_view()->GetTabStripHeight() - avatar_insets.bottom();
   int avatar_y = avatar_bottom - incognito_icon.height();
   if (!ui::MaterialDesignController::IsModeMaterial() &&
       browser_view()->IsTabStripVisible() &&
       (frame()->IsMaximized() || frame()->IsFullscreen())) {
     avatar_y = GetTopInset(false) + kContentShadowHeight;
   }
 
   // Hide the incognito icon in immersive fullscreen when the tab light bar is
   // visible because the header is too short for the icognito icon to be
   // recognizable.
   const bool avatar_visible = !UseImmersiveLightbarHeaderStyle();
   const int avatar_height = avatar_visible ? (avatar_bottom - avatar_y) : 0;
-  avatar_button()->SetBounds(avatar_insets.left(), avatar_y,
-                             incognito_icon.width(), avatar_height);
-  avatar_button()->SetVisible(avatar_visible);
+  profile_indicator_icon()->SetBounds(avatar_insets.left(), avatar_y,
+                                      incognito_icon.width(), avatar_height);
+  profile_indicator_icon()->SetVisible(avatar_visible);
 }
 
 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 =
@@ skipping 75 matching lines @@
     // TODO(pkasting): The "2 *" part of this makes no sense to me.
     canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w,
                          img_y, img_w, img_h);
 
     // Toolbar/content separator.
     toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness,
                          kClientEdgeThickness, 0);
     canvas->FillRect(toolbar_bounds, separator_color);
   }
 }