| Index: chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| index 76e742b6961a6d72c1679fae7c9083035d843789..54db3f9e45b6ce6546c0a4c108bf7c88c07f6c78 100644
|
| --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| @@ -7,16 +7,13 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.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/window/non_client_view.h"
|
|
|
| class BrowserView;
|
|
|
| class GlassBrowserFrameView : public BrowserNonClientFrameView,
|
| - public views::ButtonListener,
|
| - public content::NotificationObserver {
|
| + public views::ButtonListener {
|
| public:
|
| // Constructs a non-client view for an BrowserFrame.
|
| GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
|
| @@ -50,6 +47,9 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
|
| virtual void ButtonPressed(views::Button* sender,
|
| const ui::Event& event) override;
|
|
|
| + // BrowserNonClientFrameView:
|
| + void UpdateNewStyleAvatar() override;
|
| +
|
| private:
|
| // views::NonClientFrameView:
|
| virtual bool DoesIntersectRect(const views::View* target,
|
| @@ -89,11 +89,6 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
|
| // Displays the next throbber frame.
|
| void DisplayNextThrobberFrame();
|
|
|
| - // content::NotificationObserver implementation:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| -
|
| // The layout rect of the avatar icon, if visible.
|
| gfx::Rect avatar_bounds_;
|
|
|
| @@ -106,8 +101,6 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
|
| // The index of the current frame of the throbber animation.
|
| int throbber_frame_;
|
|
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| static const int kThrobberIconCount = 24;
|
| static HICON throbber_icons_[kThrobberIconCount];
|
| static void InitThrobberIcons();
|
|
|