[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

 // Copyright 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_ash.h"
 
 #include <algorithm>
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/default_header_painter.h"
@@ skipping 108 matching lines @@
   AddChildView(caption_button_container_);
 
   // Initializing the TabIconView is expensive, so only do it if we need to.
   if (browser_view()->ShouldShowWindowIcon()) {
     window_icon_ = new TabIconView(this, nullptr);
     window_icon_->set_is_light(true);
     AddChildView(window_icon_);
     window_icon_->Update();
   }
 
-  if (browser_view()->IsRegularOrGuestSession() &&
-      switches::IsNewAvatarMenu()) {
-    UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON);
-  } else {
-    UpdateAvatarInfo();
-  }
+  UpdateAvatar();
 
   // HeaderPainter handles layout.
   if (UsePackagedAppHeaderStyle()) {
     ash::DefaultHeaderPainter* header_painter = new ash::DefaultHeaderPainter;
     header_painter_.reset(header_painter);
     header_painter->Init(frame(), this, caption_button_container_);
     if (window_icon_) {
       header_painter->UpdateLeftHeaderView(window_icon_);
     }
   } else if (UseWebAppHeaderStyle()) {
@@ skipping 70 matching lines @@
     web_app_left_header_view_->Update();
 }
 
 views::View* BrowserNonClientFrameViewAsh::GetLocationIconView() const {
   if (web_app_left_header_view_)
     return web_app_left_header_view_->GetLocationIconView();
 
   return nullptr;
 }
 
+void BrowserNonClientFrameViewAsh::UpdateNewStyleAvatar() {
+  UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // views::NonClientFrameView:
 
 gfx::Rect BrowserNonClientFrameViewAsh::GetBoundsForClientView() const {
   // The ClientView must be flush with the top edge of the widget so that the
   // web contents can take up the entire screen in immersive fullscreen (with
   // or without the top-of-window views revealed). When in immersive fullscreen
   // and the top-of-window views are revealed, the TopContainerView paints the
   // window header by redirecting paints from its background to
   // BrowserNonClientFrameViewAsh.
@@ skipping 430 matching lines @@
           ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
 }
 
 void BrowserNonClientFrameViewAsh::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle() && !UseWebAppHeaderStyle());
   canvas->FillRect(gfx::Rect(0, caption_button_container_->bounds().bottom(),
                              width(), kClientEdgeThickness),
                    ThemeProperties::GetDefaultColor(
                        ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
 }