[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() {
+  if (browser_view()->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())
+    UpdateNewStyleAvatar();
+  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 59 matching lines @@
       AddChildView(new_avatar_button_);
       frame_->GetRootView()->Layout();
     }
   } else if (new_avatar_button_) {
     delete new_avatar_button_;
     new_avatar_button_ = nullptr;
     frame_->GetRootView()->Layout();
   }
 }
 
-void BrowserNonClientFrameView::DrawTaskbarDecoration(
-    const gfx::Image& avatar,
-    const gfx::Image& taskbar_badge_avatar) {
-  // 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.
-  bool show_decoration = AvatarMenu::ShouldShowAvatarMenu() &&
-      !browser_view_->browser()->profile()->IsGuestSession();
-  // In tests, make sure that the browser process and profile manager are valid
-  // before using.
-  if (g_browser_process && g_browser_process->profile_manager()) {
-    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);
-}
-
 void BrowserNonClientFrameView::OnProfileAdded(
     const base::FilePath& profile_path) {
-  OnProfileAvatarChanged(profile_path);
+  UpdateTaskbarDecoration();
+  UpdateAvatar();
 }
 
 void BrowserNonClientFrameView::OnProfileWasRemoved(
     const base::FilePath& profile_path,
     const base::string16& profile_name) {
-  OnProfileAvatarChanged(profile_path);
+  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();
+}
+
+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.
   if (AvatarMenuButton::GetAvatarImages(browser_view_->browser()->profile(),
                                         AvatarMenu::ShouldShowAvatarMenu(),
                                         &avatar, &taskbar_badge_avatar,
                                         &is_rectangle)) {
-    DrawTaskbarDecoration(avatar, taskbar_badge_avatar);
+    // 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.
+    bool show_decoration = AvatarMenu::ShouldShowAvatarMenu() &&
+        !browser_view_->browser()->profile()->IsGuestSession();
+    // In tests, make sure that the browser process and profile manager are
+    // valid before using.
+    if (g_browser_process && g_browser_process->profile_manager()) {
+      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);
   }
 }