[Profiles] Remove the NotificationService from the ProfileInfoCache

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 69 matching lines @@
     OnProfileAvatarChanged(base::FilePath());
 }
 
 #if defined(ENABLE_SUPERVISED_USERS)
 void BrowserNonClientFrameView::OnThemeChanged() {
   if (supervised_user_avatar_label_)
     supervised_user_avatar_label_->UpdateLabelStyle();
 }
 #endif
 
+void BrowserNonClientFrameView::UpdateAvatar(
+    views::ButtonListener* listener,
+    const NewAvatarButton::AvatarButtonStyle style) {
+  if (browser_view()->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())
+    UpdateNewStyleAvatarInfo(listener, style);
+  else
+    UpdateAvatarInfo();
+}
+
 void BrowserNonClientFrameView::UpdateAvatarInfo() {
   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);
@@ skipping 112 matching lines @@
   // 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.
   if (AvatarMenuButton::GetAvatarImages(browser_view_->browser()->profile(),
                                         AvatarMenu::ShouldShowAvatarMenu(),
                                         &avatar, &taskbar_badge_avatar,
                                         &is_rectangle)) {
     DrawTaskbarDecoration(avatar, taskbar_badge_avatar);
   }
 }