Update avatar button to MD (part 1)

chrome/browser/ui/views/frame/glass_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/glass_browser_frame_view.h"
 
 #include <dwmapi.h>
 #include <utility>
 
 #include "base/win/windows_version.h"
@@ skipping 31 matching lines @@
 namespace {
 // Thickness of the frame edge between the non-client area and the web content.
 const int kClientBorderThickness = 3;
 // Besides the frame border, there's empty space atop the window in restored
 // mode, to use to drag the window around.
 const int kNonClientRestoredExtraThickness = 11;
 // At the window corners the resize area is not actually bigger, but the 16
 // pixels at the end of the top and bottom edges trigger diagonal resizing.
 const int kResizeCornerWidth = 16;
 // How far the profile switcher button is from the left of the minimize button.
-const int kProfileSwitcherButtonOffset = 5;
+const int kProfileSwitcherButtonOffset = 1;
 // The content edge images have a shadow built into them.
 const int kContentEdgeShadowThickness = 2;
 // In restored mode, the New Tab button isn't at the same height as the caption
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionRestoredSpacing = 5;
 // In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
-// Height of the profile switcher button. Same as the height of the Windows 7/8
-// caption buttons.
-// TODO(bsep): Windows 10 caption buttons look very different and we would like
-// the profile switcher button to match on that platform.
-const int kProfileSwitcherButtonHeight = 20;
 // There is a small one-pixel strip right above the caption buttons in which the
 // resize border "peeks" through.
 const int kCaptionButtonTopInset = 1;
 
 // Converts the |image| to a Windows icon and returns the corresponding HICON
 // handle. |image| is resized to desired |width| and |height| if needed.
 base::win::ScopedHICON CreateHICONFromSkBitmapSizedTo(
     const gfx::ImageSkia& image,
     int width,
     int height) {
@@ skipping 14 matching lines @@
                                              BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       window_icon_(nullptr),
       window_title_(nullptr),
       profile_switcher_(this),
       minimize_button_(nullptr),
       maximize_button_(nullptr),
       restore_button_(nullptr),
       close_button_(nullptr),
       throbber_running_(false),
-      throbber_frame_(0) {
+      throbber_frame_(0),
+      tab_strip_observer_(this) {
   // We initialize all fields despite some of them being unused in some modes,
   // since it's possible for modes to flip dynamically (e.g. if the user enables
   // a high-contrast theme). Throbber icons are only used when ShowSystemIcon()
   // is true. Everything else here is only used when
   // ShouldCustomDrawSystemTitlebar() is true.
 
   if (browser_view->ShouldShowWindowIcon()) {
     InitThrobberIcons();
 
     window_icon_ = new TabIconView(this, nullptr);
@@ skipping 11 matching lines @@
     window_title_->set_id(VIEW_ID_WINDOW_TITLE);
     AddChildView(window_title_);
   }
 
   minimize_button_ = CreateCaptionButton(VIEW_ID_MINIMIZE_BUTTON);
   maximize_button_ = CreateCaptionButton(VIEW_ID_MAXIMIZE_BUTTON);
   restore_button_ = CreateCaptionButton(VIEW_ID_RESTORE_BUTTON);
   close_button_ = CreateCaptionButton(VIEW_ID_CLOSE_BUTTON);
 }
 
-GlassBrowserFrameView::~GlassBrowserFrameView() {
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, BrowserNonClientFrameView implementation:
 
 gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   const int x = incognito_bounds_.right() + kAvatarIconPadding;
   int end_x = width() - ClientBorderThickness(false);
   if (!CaptionButtonsOnLeadingEdge()) {
     end_x = std::min(MinimizeButtonX(), end_x) -
             (IsMaximized() ? kNewTabCaptionMaximizedSpacing
                            : kNewTabCaptionRestoredSpacing);
 
     // The profile switcher button is optionally displayed to the left of the
     // minimize button.
-    if (profile_switcher_.view()) {
+    views::View* profile_switcher = GetProfileSwitcherView();
+    if (profile_switcher) {
       const int old_end_x = end_x;
-      end_x -= profile_switcher_.view()->width() + kProfileSwitcherButtonOffset;
+      end_x -= profile_switcher->width() + kProfileSwitcherButtonOffset;
 
       // In non-maximized mode, allow the new tab button to slide completely
       // under the profile switcher button.
       if (!IsMaximized()) {
         end_x = std::min(end_x + GetLayoutSize(NEW_TAB_BUTTON).width() +
                              kNewTabCaptionRestoredSpacing,
                          old_end_x);
       }
     }
   }
@@ skipping 46 matching lines @@
     min_size.set_width(std::max(min_tabstrip_area_width, min_size.width()));
   }
 
   return min_size;
 }
 
 views::View* GlassBrowserFrameView::GetProfileSwitcherView() const {
   return profile_switcher_.view();
 }
 
+void GlassBrowserFrameView::OnBrowserViewInitViewsComplete() {
+  if (browser_view()->tabstrip()) {
+    DCHECK(!tab_strip_observer_.IsObserving(browser_view()->tabstrip()));
+    tab_strip_observer_.Add(browser_view()->tabstrip());
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, views::NonClientFrameView implementation:
 
 gfx::Rect GlassBrowserFrameView::GetBoundsForClientView() const {
   return client_view_bounds_;
 }
 
 gfx::Rect GlassBrowserFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   HWND hwnd = views::HWNDForWidget(frame());
@@ skipping 138 matching lines @@
   const content::WebContents* current_tab =
       browser_view()->GetActiveWebContents();
   return current_tab && current_tab->IsLoading();
 }
 
 gfx::ImageSkia GlassBrowserFrameView::GetFaviconForTabIconView() {
   DCHECK(ShowCustomIcon());
   return frame()->widget_delegate()->GetWindowIcon();
 }
 
+void GlassBrowserFrameView::TabStripMaxXChanged(TabStrip* tab_strip) {
+  // The profile switcher button's height depends on the position of the new
+  // tab button.
+  if (browser_view()->IsRegularOrGuestSession())
+    LayoutProfileSwitcher();
+}
+
+void GlassBrowserFrameView::TabStripRemovedTabAt(TabStrip* tab_strip,
+                                                 int index) {
+  // The profile switcher button may need to change height here, too.
+  // TabStripMaxXChanged is not enough when a tab other than the last tab is
+  // closed.
+  if (browser_view()->IsRegularOrGuestSession())
+    LayoutProfileSwitcher();
+}
+
+void GlassBrowserFrameView::TabStripDeleted(TabStrip* tab_strip) {
+  tab_strip_observer_.Remove(tab_strip);
+}
+
 bool GlassBrowserFrameView::IsMaximized() const {
   return frame()->IsMaximized();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, views::View overrides:
 
 void GlassBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (ShouldCustomDrawSystemTitlebar())
     PaintTitlebar(canvas);
@@ skipping 11 matching lines @@
     // must be called prior to LayoutProfileSwitcher().
     LayoutCaptionButtons();
     LayoutTitleBar();
   }
   if (browser_view()->IsRegularOrGuestSession())
     LayoutProfileSwitcher();
   LayoutIncognitoIcon();
   LayoutClientView();
 }
 
+void GlassBrowserFrameView::ChildPreferredSizeChanged(views::View* child) {
+  if (child == GetProfileSwitcherView()) {
+    // Need to layout the root view here, too, as the avatar button may change
+    // between the text and the icon when a profile is added or removed, which
+    // changes its width. This may cause it to start or stop overlapping the
+    // the tabstrip horizontally, which in turn causes it to change height, as
+    // calculated in LayoutProfileSwitcher(). Calling LayoutProfileSwitcher()
+    // is not enough here - it does not re-draw the line below the tabstrip
+    // properly when a profile is added or removed.
+    frame()->GetRootView()->Layout();
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, protected:
 
 // BrowserNonClientFrameView:
 void GlassBrowserFrameView::UpdateProfileIcons() {
   if (browser_view()->IsRegularOrGuestSession())
     profile_switcher_.Update(AvatarButtonStyle::NATIVE);
   else
     UpdateProfileIndicatorIcon();
 }
@@ skipping 291 matching lines @@
                  bottom + kClientEdgeThickness - y);
   canvas->FillRect(side, color);
   canvas->FillRect(gfx::Rect(x, bottom, right - x, kClientEdgeThickness),
                    color);
   side.set_x(right);
   canvas->FillRect(side, color);
 }
 
 void GlassBrowserFrameView::LayoutProfileSwitcher() {
   DCHECK(browser_view()->IsRegularOrGuestSession());
-  if (!profile_switcher_.view())
+
+  View* profile_switcher = profile_switcher_.view();
+  if (!profile_switcher)
     return;
 
-  gfx::Size label_size = profile_switcher_.view()->GetPreferredSize();
+  gfx::Size button_size = profile_switcher->GetPreferredSize();
+  int button_width = button_size.width();
+  int button_height = button_size.height();
 
   int button_x;
   if (CaptionButtonsOnLeadingEdge()) {
     button_x = width() - frame()->GetMinimizeButtonOffset() +
                kProfileSwitcherButtonOffset;
   } else {
-    button_x =
-        MinimizeButtonX() - kProfileSwitcherButtonOffset - label_size.width();
+    button_x = MinimizeButtonX() - kProfileSwitcherButtonOffset - button_width;
   }
 
   int button_y = WindowTopY();
   if (IsMaximized()) {
     // In maximized mode the caption buttons appear only 19 pixels high, but
     // their contents are aligned as if they were 20 pixels high and extended
     // 1 pixel off the top of the screen. We position the profile switcher
     // button the same way to match.
     button_y -= 1;
   }
-  profile_switcher_.view()->SetBounds(button_x, button_y, label_size.width(),
-                                      kProfileSwitcherButtonHeight);
+
+  // Shrink the button height when it's atop part of the tabstrip. In RTL the
+  // new tab button is on the left, so it can never slide under the avatar
+  // button, which is still on the right [http://crbug.com/560619].
+  TabStrip* tabstrip = browser_view()->tabstrip();
+  if (tabstrip && !base::i18n::IsRTL() && tabstrip->max_x() >= button_x)
+    button_height = profile_switcher->GetMinimumSize().height();
+
+  profile_switcher->SetBounds(button_x, button_y, button_width, button_height);
 }
 
 void GlassBrowserFrameView::LayoutIncognitoIcon() {
   const gfx::Size size(GetIncognitoAvatarIcon().size());
   int x = ClientBorderThickness(false);
   // In RTL, the icon needs to start after the caption buttons.
   if (CaptionButtonsOnLeadingEdge()) {
     x = width() - frame()->GetMinimizeButtonOffset() +
-        (profile_switcher_.view() ? (profile_switcher_.view()->width() +
+        (GetProfileSwitcherView() ? (GetProfileSwitcherView()->width() +
                                      kProfileSwitcherButtonOffset)
                                   : 0);
   }
   const int bottom = GetTopInset(false) + browser_view()->GetTabStripHeight() -
                      kAvatarIconPadding;
   incognito_bounds_.SetRect(
       x + (profile_indicator_icon() ? kAvatarIconPadding : 0),
       bottom - size.height(), profile_indicator_icon() ? size.width() : 0,
       size.height());
   if (profile_indicator_icon())
@@ skipping 152 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }