Resize avatar button as appropriate for opaque browser frame.

chrome/browser/ui/views/frame/browser_non_client_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/browser_non_client_frame_view.h"
 
 #include "build/build_config.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
@@ skipping 53 matching lines @@
                                : ThemeProperties::GetDefaultColor(
                                      color_id, browser_view_->IsIncognito());
 }
 
 views::View* BrowserNonClientFrameView::GetProfileSwitcherView() const {
   return nullptr;
 }
 
 void BrowserNonClientFrameView::UpdateClientArea() {}
 
+void BrowserNonClientFrameView::ChildPreferredSizeChanged(views::View* child) {
+  if (child == GetProfileSwitcherView()) {
+    // Need to layout the root view here, too, as the avatar button may change

[Peter Kasting, 2017/05/22 18:44:14]

Nit: Not clear what "here, too," means in this context -- just remove?

[Evan Stade, 2017/05/22 20:32:48]

Done.

+    // 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()

[Peter Kasting, 2017/05/22 18:44:15]

Nit: LayoutProfileSwitcher() is not a member of this class.  Mention
GlassBrowserFrameView:: specifically?

Though it worries me that you're needing to hoist code to where it will be
triggered for the opaque frame, but I don't think any of what this is talking
about applies to the opaque frame.  Maybe the comment should be written to
either add, or talk only about, the symptoms that affect both frames
(presumably, like the current bug you're dealing with)?

[Evan Stade, 2017/05/22 20:32:48]

I replaced this comment with the one we used to have in
AvatarButtonManager::ButtonPreferredSizeChanged()

+    // is not enough here - it does not re-draw the line below the tabstrip
+    // properly when a profile is added or removed. Even adding
+    // browser_view()->tabstrip()->Layout() and SchedulePaint() is not enough.
+    // TODO(bsep): Figure out the most efficient way to do this.
+    frame()->GetRootView()->Layout();
+  }
+}
+
 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from,
                                                   bool is_visible) {
   // UpdateTaskbarDecoration() calls DrawTaskbarDecoration(), but that does
   // nothing if the window is not visible.  So even if we've already gotten the
   // up-to-date decoration, we need to run the update procedure again here when
   // the window becomes visible.
   if (is_visible)
     OnProfileAvatarChanged(base::FilePath());
 }
 
@@ skipping 187 matching lines @@
   // safety. See crbug.com/313800.
   gfx::Image decoration;
   AvatarMenu::GetImageForMenuButton(
       browser_view()->browser()->profile()->GetPath(), &decoration);
   // This can happen if the user deletes the current profile.
   if (decoration.IsEmpty())
     return;
   chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(), &decoration);
 #endif
 }