Revert of Refactor the avatar button/icon class

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 197 matching lines @@
       RemoveChildView(supervised_user_avatar_label_);
       delete supervised_user_avatar_label_;
       supervised_user_avatar_label_ = nullptr;
     }
 #endif
     RemoveChildView(avatar_button_);
     delete avatar_button_;
     avatar_button_ = nullptr;
     frame_->GetRootView()->Layout();
   }
+
+  gfx::Image avatar;
+  gfx::Image taskbar_badge_avatar;
+  bool is_rectangle = false;
+
+  // Update the avatar button in the window frame and the taskbar overlay.
+  bool should_show_avatar_menu =
+      avatar_button_ || AvatarMenu::ShouldShowAvatarMenu();
+
+  if (!AvatarMenuButton::GetAvatarImages(
+          browser_view_->browser()->profile(), should_show_avatar_menu, &avatar,
+          &taskbar_badge_avatar, &is_rectangle)) {
+    return;
+  }
+
+  // Disable the menu when we should not show the menu.
+  if (avatar_button_ && !AvatarMenu::ShouldShowAvatarMenu())
+    avatar_button_->SetEnabled(false);
+  if (avatar_button_)
+    avatar_button_->SetAvatarIcon(avatar, is_rectangle);
 }
 
 void BrowserNonClientFrameView::UpdateNewAvatarButton(
     views::ButtonListener* listener,
     const NewAvatarButton::AvatarButtonStyle style) {
   DCHECK(switches::IsNewAvatarMenu());
   // This should never be called in incognito mode.
   DCHECK(browser_view_->IsRegularOrGuestSession());
 
   if (browser_view_->ShouldShowAvatar()) {
@@ skipping 62 matching lines @@
       const ProfileInfoCache& cache =
           g_browser_process->profile_manager()->GetProfileInfoCache();
       show_decoration = show_decoration && cache.GetNumberOfProfiles() > 1;
     }
     chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(),
         show_decoration
             ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar)
             : nullptr);
   }
 }