[reland] views: Move MenuButton from TextButton to LabelButton.

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
index a6ba3c2a869e9db7e78ea49c0bf4d3c6f334f769..ac0fda327bf4ba080be35be7841702e95ef38030 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -121,11 +121,8 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() {
     if (avatar_button_ && !AvatarMenu::ShouldShowAvatarMenu())
       avatar_button_->SetEnabled(false);
   }
-  if (avatar_button_) {
+  if (avatar_button_)
     avatar_button_->SetAvatarIcon(avatar, is_rectangle);
-    if (!text.empty())
-      avatar_button_->SetText(text);
-  }
 
   // For popups and panels which don't have the avatar button, we still
   // need to draw the taskbar decoration. Even though we have an icon on the