[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 304 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // views::ButtonListener:
 
 void BrowserNonClientFrameViewAsh::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
   DCHECK(sender == new_avatar_button());
   chrome::ExecuteCommand(browser_view()->browser(), IDC_SHOW_AVATAR_MENU);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// BrowserNonClientFrameViewAsh, protected:
+
+// BrowserNonClientFrameView:
+void BrowserNonClientFrameViewAsh::UpdateNewStyleAvatar() {
+  UpdateNewStyleAvatarInfo(this, NewAvatarButton::NATIVE_BUTTON);
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 // views::NonClientFrameView:
 bool BrowserNonClientFrameViewAsh::DoesIntersectRect(
     const views::View* target,
     const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
   if (!views::ViewTargeterDelegate::DoesIntersectRect(this, rect)) {
     // |rect| is outside BrowserNonClientFrameViewAsh's bounds.
     return false;
@@ skipping 196 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));
 }