Simplify some old avatar menu button code.

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

 // Copyright 2015 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_mus.h"
 
 #include <algorithm>
 
 #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/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_frame_mus.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/web_applications/web_app.h"
 #include "components/mus/public/cpp/window.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 15 matching lines @@
 #include "ui/views/widget/widget_delegate.h"
 
 #if !defined(OS_CHROMEOS)
 #define FRAME_AVATAR_BUTTON
 #endif
 
 namespace {
 
 #if defined(FRAME_AVATAR_BUTTON)
 // Space between the new avatar button and the minimize button.
-const int kNewAvatarButtonOffset = 5;
+const int kAvatarButtonOffset = 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 = 4;
 // Space between top of window and top of tabstrip for short headers, such as
 // for maximized windows, pop-ups, etc.
@@ skipping 202 matching lines @@
     return;
   }
 
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
   else if (!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle())
     PaintContentEdge(canvas);
 }
 
 void BrowserNonClientFrameViewMus::Layout() {
-  if (avatar_button())
+  if (profile_indicator_icon())
     LayoutIncognitoButton();
 
 #if defined(FRAME_AVATAR_BUTTON)
   if (profile_switcher_.view())
     LayoutProfileSwitcher();
 #endif
 
   BrowserNonClientFrameView::Layout();
 
   UpdateClientArea();
@@ skipping 38 matching lines @@
 gfx::ImageSkia BrowserNonClientFrameViewMus::GetFaviconForTabIconView() {
   views::WidgetDelegate* delegate = frame()->widget_delegate();
   if (!delegate)
     return gfx::ImageSkia();
   return delegate->GetWindowIcon();
 }
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewMus, protected:
 
 // BrowserNonClientFrameView:
-void BrowserNonClientFrameViewMus::UpdateAvatar() {
+void BrowserNonClientFrameViewMus::UpdateProfileIcons() {
 #if defined(FRAME_AVATAR_BUTTON)
   if (browser_view()->IsRegularOrGuestSession())
     profile_switcher_.Update(AvatarButtonStyle::NATIVE);
   else
 #endif
-    UpdateOldAvatarButton();
+    UpdateProfileIndicatorIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewMus, private:
 
 mus::Window* BrowserNonClientFrameViewMus::mus_window() {
   return static_cast<BrowserFrameMus*>(frame()->native_widget())->window();
 }
 
 void BrowserNonClientFrameViewMus::UpdateClientArea() {
@@ skipping 41 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 BrowserNonClientFrameViewMus::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() + frame_values().normal_insets.left();
 }
 
 int BrowserNonClientFrameViewMus::GetTabStripRightInset() const {
   const int frame_right_insets = frame_values().normal_insets.right() +
                                  frame_values().max_title_bar_button_width;
   int right_inset = kTabstripRightSpacing + frame_right_insets;
 
 #if defined(FRAME_AVATAR_BUTTON)
   if (profile_switcher_.view()) {
-    right_inset += kNewAvatarButtonOffset +
+    right_inset += kAvatarButtonOffset +
                    profile_switcher_.view()->GetPreferredSize().width();
   }
 #endif
 
   return right_inset;
 }
 
 bool BrowserNonClientFrameViewMus::UseImmersiveLightbarHeaderStyle() const {
   ImmersiveModeController* immersive_controller =
       browser_view()->immersive_mode_controller();
@@ skipping 12 matching lines @@
   // style.
   return browser->is_app() && !UseWebAppHeaderStyle();
 }
 
 bool BrowserNonClientFrameViewMus::UseWebAppHeaderStyle() const {
   return browser_view()->browser()->SupportsWindowFeature(
       Browser::FEATURE_WEBAPPFRAME);
 }
 
 void BrowserNonClientFrameViewMus::LayoutIncognitoButton() {
-  DCHECK(avatar_button());
+  DCHECK(profile_indicator_icon());
 #if !defined(OS_CHROMEOS)
   // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
   gfx::ImageSkia incognito_icon = GetOTRAvatarIcon();
   gfx::Insets avatar_insets = GetLayoutInsets(AVATAR_ICON);
   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.
   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);
+  profile_indicator_icon()->SetBoundsRect(avatar_bounds);
+  profile_indicator_icon()->SetVisible(avatar_visible);
 }
 
 void BrowserNonClientFrameViewMus::LayoutProfileSwitcher() {
 #if defined(FRAME_AVATAR_BUTTON)
   gfx::Size button_size = profile_switcher_.view()->GetPreferredSize();
-  int button_x = width() - GetTabStripRightInset() + kNewAvatarButtonOffset;
+  int button_x = width() - GetTabStripRightInset() + kAvatarButtonOffset;
   profile_switcher_.view()->SetBounds(button_x, 0, button_size.width(),
                                       button_size.height());
 #endif
 }
 
 bool BrowserNonClientFrameViewMus::ShouldPaint() const {
   if (!frame()->IsFullscreen())
     return true;
 
   // We need to paint when in immersive fullscreen and either:
@@ skipping 121 matching lines @@
 }
 
 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   const int bottom = frame_values().normal_insets.bottom();
   canvas->FillRect(
       gfx::Rect(0, bottom, width(), kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }