Simplify some old avatar menu button code.

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.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/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_strings.h"
@@ skipping 150 matching lines @@
   return layout_->client_view_bounds();
 }
 
 gfx::Rect OpaqueBrowserFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return layout_->GetWindowBoundsForClientBounds(client_bounds);
 }
 
 bool OpaqueBrowserFrameView::IsWithinAvatarMenuButtons(
     const gfx::Point& point) const {
-  if (avatar_button() &&
-     avatar_button()->GetMirroredBounds().Contains(point)) {
+  if (profile_indicator_icon() &&
+      profile_indicator_icon()->GetMirroredBounds().Contains(point)) {
     return true;
   }
   if (profile_switcher_.view() &&
       profile_switcher_.view()->GetMirroredBounds().Contains(point)) {
     return true;
   }
 
   return false;
 }
 
@@ skipping 170 matching lines @@
 }
 
 gfx::Size OpaqueBrowserFrameView::GetBrowserViewMinimumSize() const {
   return browser_view()->GetMinimumSize();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowCaptionButtons() const {
   return ShouldShowWindowTitleBar();
 }
 
-bool OpaqueBrowserFrameView::ShouldShowAvatar() const {
-  return browser_view()->ShouldShowAvatar();
-}
-
 bool OpaqueBrowserFrameView::IsRegularOrGuestSession() const {
   return browser_view()->IsRegularOrGuestSession();
 }
 
 gfx::ImageSkia OpaqueBrowserFrameView::GetOTRAvatarIcon() const {
   return BrowserNonClientFrameView::GetOTRAvatarIcon();
 }
 
 bool OpaqueBrowserFrameView::IsMaximized() const {
   return frame()->IsMaximized();
@@ skipping 58 matching lines @@
   PaintClientEdge(canvas);
 }
 
 // BrowserNonClientFrameView:
 bool OpaqueBrowserFrameView::ShouldPaintAsThemed() const {
   // Theme app and popup windows if |platform_observer_| wants it.
   return browser_view()->IsBrowserTypeNormal() ||
          platform_observer_->IsUsingSystemTheme();
 }
 
-void OpaqueBrowserFrameView::UpdateAvatar() {
+void OpaqueBrowserFrameView::UpdateProfileIcons() {
   if (browser_view()->IsRegularOrGuestSession())
     profile_switcher_.Update(AvatarButtonStyle::THEMED);
   else
-    UpdateOldAvatarButton();
+    UpdateProfileIndicatorIcon();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, private:
 
 // views::NonClientFrameView:
 bool OpaqueBrowserFrameView::DoesIntersectRect(const views::View* target,
                                                const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
   if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) {
@@ skipping 346 matching lines @@
   gfx::Rect side(x, y, kClientEdgeThickness, h);
   canvas->FillRect(side, color);
   if (draw_bottom) {
     canvas->FillRect(gfx::Rect(x, y + h, w + (2 * kClientEdgeThickness),
                                kClientEdgeThickness),
                      color);
   }
   side.Offset(w + kClientEdgeThickness, 0);
   canvas->FillRect(side, color);
 }