[Win] Cleanup: The BrowserFrameView doesn't need to listen to profile name changes.

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 52 matching lines @@
 
 views::View* BrowserNonClientFrameView::GetLocationIconView() const {
   return nullptr;
 }
 
 void BrowserNonClientFrameView::VisibilityChanged(views::View* starting_from,
                                                   bool is_visible) {
   if (!is_visible)
     return;
 
-  // The first time UpdateAvatarInfo() is called the window is not visible so
-  // DrawTaskBarDecoration() has no effect. Therefore we need to call it again
-  // once the window is visible.
+  // The first time UpdateOldAvatarButton() is called the window is not visible
+  // so DrawTaskBarDecoration() has no effect. Therefore we need to call it
+  // again once the window is visible.
   if (!browser_view_->IsRegularOrGuestSession() ||
       !switches::IsNewAvatarMenu()) {
-    UpdateAvatarInfo();
+    UpdateOldAvatarButton();
   }
 
   // Make sure the task bar icon is correctly updated call
   // |OnProfileAvatarChanged()| in this case, but only for non guest profiles.
   if (!browser_view_->IsGuestSession() || !switches::IsNewAvatarMenu())
     OnProfileAvatarChanged(base::FilePath());
 }
 
 void BrowserNonClientFrameView::ChildPreferredSizeChanged(View* child) {
   // Only perform a re-layout if the avatar button has changed, since that
@@ skipping 79 matching lines @@
   int top_area_height = frame_image->height();
   if (browser_view_->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view_->tabstrip()).bottom());
   }
   return top_area_height;
 }
 
 void BrowserNonClientFrameView::UpdateAvatar() {
   if (browser_view()->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())
-    UpdateNewStyleAvatar();
+    UpdateNewAvatarButtonImpl();
   else
-    UpdateAvatarInfo();
+    UpdateOldAvatarButton();
 }
 
-void BrowserNonClientFrameView::UpdateAvatarInfo() {
+void BrowserNonClientFrameView::UpdateOldAvatarButton() {
   if (browser_view_->ShouldShowAvatar()) {
     if (!avatar_button_) {
 #if defined(ENABLE_SUPERVISED_USERS)
       Profile* profile = browser_view_->browser()->profile();
       if (profile->IsSupervised() && !supervised_user_avatar_label_) {
         supervised_user_avatar_label_ =
             new SupervisedUserAvatarLabel(browser_view_);
         supervised_user_avatar_label_->set_id(
             VIEW_ID_SUPERVISED_USER_AVATAR_LABEL);
         AddChildView(supervised_user_avatar_label_);
@@ skipping 36 matching lines @@
     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::UpdateNewStyleAvatarInfo(
+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()) {
     if (!new_avatar_button_) {
       new_avatar_button_ =
           new NewAvatarButton(listener, style, browser_view_->browser());
@@ skipping 19 matching lines @@
     const base::string16& profile_name) {
   UpdateTaskbarDecoration();
   UpdateAvatar();
 }
 
 void BrowserNonClientFrameView::OnProfileAvatarChanged(
     const base::FilePath& profile_path) {
   UpdateTaskbarDecoration();
   // Profile avatars are only displayed in the old UI or incognito.
   if (browser_view()->IsOffTheRecord() || !switches::IsNewAvatarMenu())
-    UpdateAvatarInfo();
-}
-
-void BrowserNonClientFrameView::OnProfileNameChanged(
-    const base::FilePath& profile_path,
-    const base::string16& old_profile_name) {
-  UpdateAvatar();
+    UpdateOldAvatarButton();
 }
 
 void BrowserNonClientFrameView::UpdateTaskbarDecoration() {
   gfx::Image avatar;
   gfx::Image taskbar_badge_avatar;
   bool is_rectangle;
   // Only need to update the taskbar overlay here.  If GetAvatarImages()
   // returns false, don't bother trying to update the taskbar decoration since
   // the returned images are not initialized.  This can happen if the user
   // deletes the current profile.
@@ skipping 17 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);
   }
 }