[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/ui/views/frame/opaque_browser_frame_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h"
 #include "chrome/browser/ui/views/tab_icon_view_model.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/window/non_client_view.h"
 
 class BrowserView;
 class OpaqueBrowserFrameViewLayout;
 class OpaqueBrowserFrameViewPlatformSpecific;
 class TabIconView;
 class NewAvatarButton;
 
 namespace views {
 class ImageButton;
 class FrameBackground;
 class Label;
 }
 
 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
-                               public content::NotificationObserver,
                                public views::ButtonListener,
                                public views::MenuButtonListener,
                                public chrome::TabIconViewModel,
                                public OpaqueBrowserFrameViewLayoutDelegate {
  public:
   // Constructs a non-client view for an BrowserFrame.
   OpaqueBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
   ~OpaqueBrowserFrameView() override;
 
   // BrowserNonClientFrameView:
@@ skipping 21 matching lines @@
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // views::MenuButtonListener:
   void OnMenuButtonClicked(views::View* source,
                            const gfx::Point& point) override;
 
   // chrome::TabIconViewModel:
   bool ShouldTabIconViewAnimate() const override;
   gfx::ImageSkia GetFaviconForTabIconView() override;
 
-  // content::NotificationObserver implementation:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   // OpaqueBrowserFrameViewLayoutDelegate implementation:
   bool ShouldShowWindowIcon() const override;
   bool ShouldShowWindowTitle() const override;
   base::string16 GetWindowTitle() const override;
   int GetIconSize() const override;
   bool ShouldLeaveOffsetNearTopBorder() const override;
   gfx::Size GetBrowserViewMinimumSize() const override;
   bool ShouldShowCaptionButtons() const override;
   bool ShouldShowAvatar() const override;
   bool IsRegularOrGuestSession() const override;
   gfx::ImageSkia GetOTRAvatarIcon() const override;
   bool IsMaximized() const override;
   bool IsMinimized() const override;
   bool IsFullscreen() const override;
   bool IsTabStripVisible() const override;
   int GetTabStripHeight() const override;
   gfx::Size GetTabstripPreferredSize() const override;
 
  protected:
   views::ImageButton* minimize_button() const { return minimize_button_; }
   views::ImageButton* maximize_button() const { return maximize_button_; }
   views::ImageButton* restore_button() const { return restore_button_; }
   views::ImageButton* close_button() const { return close_button_; }
 
   // views::View:
   void OnPaint(gfx::Canvas* canvas) override;
 
+  // BrowserNonClientFrameView:
+  void UpdateNewStyleAvatar() override;
+
  private:
   // views::NonClientFrameView:
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
   // Creates, adds and returns a new image button with |this| as its listener.
   // Memory is owned by the caller.
   views::ImageButton* InitWindowCaptionButton(int normal_image_id,
                                               int hot_image_id,
                                               int pushed_image_id,
@@ skipping 47 matching lines @@
   // Window controls.
   views::ImageButton* minimize_button_;
   views::ImageButton* maximize_button_;
   views::ImageButton* restore_button_;
   views::ImageButton* close_button_;
 
   // The window icon and title.
   TabIconView* window_icon_;
   views::Label* window_title_;
 
-  content::NotificationRegistrar registrar_;
-
   // Background painter for the window frame.
   scoped_ptr<views::FrameBackground> frame_background_;
 
   // Observer that handles platform dependent configuration.
   scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_