Simplify some old avatar menu button code.

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

 // Copyright 2013 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_layout.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/layout_constants.h"
-#include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
+#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
 const int kCaptionButtonHeight = 18;
@@ skipping 43 matching lines @@
 
 // The minimum vertical padding between the bottom of the caption buttons and
 // the top of the content shadow.
 const int OpaqueBrowserFrameViewLayout::kCaptionButtonBottomPadding = 3;
 
 // When the title bar is condensed to one row (as when maximized), the New Tab
 // button and the caption buttons are at similar vertical coordinates, so we
 // need to reserve a larger, 16 px gap to avoid looking too cluttered.
 const int OpaqueBrowserFrameViewLayout::kNewTabCaptionCondensedSpacing = 16;
 
-
 OpaqueBrowserFrameViewLayout::OpaqueBrowserFrameViewLayout(
     OpaqueBrowserFrameViewLayoutDelegate* delegate)
     : delegate_(delegate),
       leading_button_start_(0),
       trailing_button_start_(0),
       minimum_size_for_buttons_(0),
       has_leading_buttons_(false),
       has_trailing_buttons_(false),
       extra_caption_y_(kExtraCaption),
       window_caption_spacing_(kCaptionButtonSpacing),
       minimize_button_(nullptr),
       maximize_button_(nullptr),
       restore_button_(nullptr),
       close_button_(nullptr),
       window_icon_(nullptr),
       window_title_(nullptr),
-      avatar_button_(nullptr),
+      incognito_icon_(nullptr),
       new_avatar_button_(nullptr) {
   trailing_buttons_.push_back(views::FRAME_BUTTON_MINIMIZE);
   trailing_buttons_.push_back(views::FRAME_BUTTON_MAXIMIZE);
   trailing_buttons_.push_back(views::FRAME_BUTTON_CLOSE);
 }
 
 OpaqueBrowserFrameViewLayout::~OpaqueBrowserFrameViewLayout() {}
 
 void OpaqueBrowserFrameViewLayout::SetButtonOrdering(
     const std::vector<views::FrameButton>& leading_buttons,
@@ skipping 264 matching lines @@
 void OpaqueBrowserFrameViewLayout::LayoutIncognitoIcon(views::View* host) {
   const int old_button_size = leading_button_start_ + trailing_button_start_;
 
   // Any buttons/icon/title were laid out based on the frame border thickness,
   // but the tabstrip bounds need to be based on the non-client border thickness
   // on any side where there aren't other buttons forcing a larger inset.
   const bool md = ui::MaterialDesignController::IsModeMaterial();
   int min_button_width = NonClientBorderThickness();
   // In non-MD, the toolbar has a rounded corner that we don't want the tabstrip
   // to overlap.
-  if (!md && !avatar_button_ && delegate_->IsToolbarVisible())
+  if (!md && !incognito_icon_ && delegate_->IsToolbarVisible())
     min_button_width += delegate_->GetToolbarLeadingCornerClientWidth();
   leading_button_start_ = std::max(leading_button_start_, min_button_width);
   // The trailing corner is a mirror of the leading one.
   trailing_button_start_ = std::max(trailing_button_start_, min_button_width);
 
-  if (avatar_button_) {
+  if (incognito_icon_) {
     const gfx::Insets insets(GetLayoutInsets(AVATAR_ICON));
     const gfx::Size size(delegate_->GetOTRAvatarIcon().size());
     const int incognito_width = insets.left() + size.width();
     int x;
     if (ShouldIncognitoIconBeOnRight()) {
       trailing_button_start_ += incognito_width;
       x = host->width() - trailing_button_start_;
     } else {
       x = leading_button_start_ + insets.left();
       leading_button_start_ += incognito_width;
     }
     const int bottom = GetTabStripInsetsTop(false) +
         delegate_->GetTabStripHeight() - insets.bottom();
     const int y = (md || !IsTitleBarCondensed()) ?
         (bottom - size.height()) : FrameBorderThickness(false);
-    avatar_button_->SetBounds(x, y, size.width(), bottom - y);
+    incognito_icon_->SetBounds(x, y, size.width(), bottom - y);
   }
 
   minimum_size_for_buttons_ +=
       (leading_button_start_ + trailing_button_start_ - old_button_size);
 }
 
 void OpaqueBrowserFrameViewLayout::ConfigureButton(
     views::View* host,
     views::FrameButton button_id,
     ButtonAlignment alignment,
@@ skipping 152 matching lines @@
     case VIEW_ID_WINDOW_ICON:
       window_icon_ = view;
       break;
     case VIEW_ID_WINDOW_TITLE:
       if (view) {
         DCHECK_EQ(std::string(views::Label::kViewClassName),
                   view->GetClassName());
       }
       window_title_ = static_cast<views::Label*>(view);
       break;
+    case VIEW_ID_PROFILE_INDICATOR_ICON:
+      incognito_icon_ = view;
+      break;
     case VIEW_ID_AVATAR_BUTTON:
-      if (view) {
-        DCHECK_EQ(std::string(AvatarMenuButton::kViewClassName),
-                  view->GetClassName());
-      }
-      avatar_button_ = static_cast<AvatarMenuButton*>(view);
-      break;
-    case VIEW_ID_NEW_AVATAR_BUTTON:
       new_avatar_button_ = view;
       break;
     default:
       NOTIMPLEMENTED() << "Unknown view id " << id;
       break;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, views::LayoutManager:
@@ skipping 28 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }