Update avatar button to MD

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/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 152 matching lines @@
 
 int BrowserNonClientFrameViewMus::GetThemeBackgroundXInset() const {
   return 5;
 }
 
 void BrowserNonClientFrameViewMus::UpdateThrobber(bool running) {
   if (window_icon_)
     window_icon_->Update();
 }
 
-views::View* BrowserNonClientFrameViewMus::GetProfileSwitcherView() const {
+views::MenuButton* BrowserNonClientFrameViewMus::GetProfileSwitcherButton()
+    const {
 #if defined(FRAME_AVATAR_BUTTON)
-  return profile_switcher_.view();
+  return profile_switcher_.button();
 #else
   return nullptr;
 #endif
 }
 
 void BrowserNonClientFrameViewMus::UpdateClientArea() {
   std::vector<gfx::Rect> additional_client_area;
   int top_container_offset = 0;
   ImmersiveModeController* immersive_mode_controller =
       browser_view()->immersive_mode_controller();
@@ skipping 57 matching lines @@
 gfx::Rect BrowserNonClientFrameViewMus::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return client_bounds;
 }
 
 int BrowserNonClientFrameViewMus::NonClientHitTest(const gfx::Point& point) {
   // TODO(sky): figure out how this interaction should work.
   int hit_test = HTCLIENT;
 
 #if defined(FRAME_AVATAR_BUTTON)
-  if (hit_test == HTCAPTION && profile_switcher_.view() &&
-      ConvertedHitTest(this, profile_switcher_.view(), point)) {
+  if (hit_test == HTCAPTION && GetProfileSwitcherButton() &&
+      ConvertedHitTest(this, GetProfileSwitcherButton(), point)) {

[Peter Kasting, 2017/04/26 02:09:53]

Nit: Use a temp to capture the return value of CamelCaseFunctions() when you're
going to check them multiple times in one function (multiple places)

[emx, 2017/04/27 16:30:58]

Done.

     return HTCLIENT;
   }
 #endif
 
   // When the window is restored we want a large click target above the tabs
   // to drag the window, so redirect clicks in the tab's shadow to caption.
   if (hit_test == HTCLIENT &&
       !(frame()->IsMaximized() || frame()->IsFullscreen())) {
     // Convert point to client coordinates.
     gfx::Point client_point(point);
@@ skipping 33 matching lines @@
     PaintToolbarBackground(canvas);
   else if (!UsePackagedAppHeaderStyle())
     PaintContentEdge(canvas);
 }
 
 void BrowserNonClientFrameViewMus::Layout() {
   if (profile_indicator_icon())
     LayoutIncognitoButton();
 
 #if defined(FRAME_AVATAR_BUTTON)
-  if (profile_switcher_.view())
+  if (GetProfileSwitcherButton())
     LayoutProfileSwitcher();
 #endif
 
   BrowserNonClientFrameView::Layout();
 
   UpdateClientArea();
 }
 
 const char* BrowserNonClientFrameViewMus::GetClassName() const {
   return kViewClassName;
@@ skipping 82 matching lines @@
   return avatar_right + kAvatarIconPadding +
          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()) {
+  if (GetProfileSwitcherButton()) {
     right_inset += kAvatarButtonOffset +
-                   profile_switcher_.view()->GetPreferredSize().width();
+                   GetProfileSwitcherButton()->GetPreferredSize().width();
   }
 #endif
 
   return right_inset;
 }
 
 bool BrowserNonClientFrameViewMus::UsePackagedAppHeaderStyle() const {
   // Use for non tabbed trusted source windows, e.g. Settings, as well as apps.
   const Browser* const browser = browser_view()->browser();
   return (!browser->is_type_tabbed() && browser->is_trusted_source()) ||
@@ skipping 13 matching lines @@
   int avatar_height = incognito_icon.height();
 
   gfx::Rect avatar_bounds(kAvatarIconPadding, avatar_y, incognito_icon.width(),
                           avatar_height);
   profile_indicator_icon()->SetBoundsRect(avatar_bounds);
   profile_indicator_icon()->SetVisible(true);
 }
 
 void BrowserNonClientFrameViewMus::LayoutProfileSwitcher() {
 #if defined(FRAME_AVATAR_BUTTON)
-  gfx::Size button_size = profile_switcher_.view()->GetPreferredSize();
+  gfx::Size button_size = GetProfileSwitcherButton()->GetPreferredSize();
   int button_x = width() - GetTabStripRightInset() + kAvatarButtonOffset;
-  profile_switcher_.view()->SetBounds(button_x, 0, button_size.width(),
-                                      button_size.height());
+  GetProfileSwitcherButton()->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 the top-of-window views are revealed in immersive
   // fullscreen.
   ImmersiveModeController* immersive_mode_controller =
@@ skipping 56 matching lines @@
   // TODO: move ash_layout_constants to ash/public/cpp.
   const bool restored = !frame()->IsMaximized() && !frame()->IsFullscreen();
   return GetAshLayoutSize(restored
                               ? AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON
                               : AshLayoutSize::BROWSER_MAXIMIZED_CAPTION_BUTTON)
       .height();
 #else
   return views::WindowManagerFrameValues::instance().normal_insets.top();
 #endif
 }