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

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 "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ skipping 103 matching lines @@
       return;
     text = cache.GetNameOfProfileAtIndex(index);
 
     AvatarMenu::GetImageForMenuButton(browser_view_->browser()->profile(),
                                       &avatar,
                                       &is_rectangle);
     // Disable the menu when we should not show the menu.
     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
   // window's relaunch details, we draw over it because the user may have pinned
   // the badge-less Chrome shortcut which will cause windows to ignore the
   // relaunch details.
   // TODO(calamity): ideally this should not be necessary but due to issues with
   // the default shortcut being pinned, we add the runtime badge for safety.
   // See crbug.com/313800.
   chrome::DrawTaskbarDecoration(
@@ skipping 19 matching lines @@
       new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);
       AddChildView(new_avatar_button_);
       frame_->GetRootView()->Layout();
     }
   } else if (new_avatar_button_) {
     delete new_avatar_button_;
     new_avatar_button_ = NULL;
     frame_->GetRootView()->Layout();
   }
 }