Update avatar icon when nonclient frame view is added to view hierarchy.

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/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 171 matching lines @@
                                          &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::ViewHierarchyChanged(
+    const ViewHierarchyChangedDetails& details) {
+  if (details.is_add && details.child == this)
+    UpdateAvatar();
+}
+
 void BrowserNonClientFrameView::OnProfileAdded(
     const base::FilePath& profile_path) {
   OnProfileAvatarChanged(profile_path);
 }
 
 void BrowserNonClientFrameView::OnProfileWasRemoved(
     const base::FilePath& profile_path,
     const base::string16& profile_name) {
   OnProfileAvatarChanged(profile_path);
 }
@@ skipping 38 matching lines @@
       const ProfileAttributesStorage& storage =
           g_browser_process->profile_manager()->GetProfileAttributesStorage();
       show_decoration = show_decoration && storage.GetNumberOfProfiles() > 1;
     }
     chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(),
         show_decoration
             ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar)
             : nullptr);
   }
 }