| Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
|
| diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
|
| index 2edd134ac6ed33664e2b5df1e8b3b7a74e6314fd..1e1f2fc3ff6d3d630b5db7fa9b721a9ccb25c095 100644
|
| --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
|
| +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
|
| @@ -11,8 +11,6 @@
|
| #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"
|
| @@ -30,7 +28,6 @@ class Label;
|
| }
|
|
|
| class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
|
| - public content::NotificationObserver,
|
| public views::ButtonListener,
|
| public views::MenuButtonListener,
|
| public chrome::TabIconViewModel,
|
| @@ -72,11 +69,6 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
|
| 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;
|
| @@ -104,6 +96,9 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
|
| // views::View:
|
| void OnPaint(gfx::Canvas* canvas) override;
|
|
|
| + // BrowserNonClientFrameView:
|
| + void UpdateNewStyleAvatar() override;
|
| +
|
| private:
|
| // views::NonClientFrameView:
|
| bool DoesIntersectRect(const views::View* target,
|
| @@ -171,8 +166,6 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
|
| TabIconView* window_icon_;
|
| views::Label* window_title_;
|
|
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| // Background painter for the window frame.
|
| scoped_ptr<views::FrameBackground> frame_background_;
|
|
|
|
|