Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view.h

Issue 895803003: [Profiles] Remove the NotificationService from the ProfileInfoCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up views code Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..1fe2f967fd9cd70ff41498561fb246b84a607d21 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,
@@ -46,6 +43,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
int GetThemeBackgroundXInset() const override;
void UpdateThrobber(bool running) override;
gfx::Size GetMinimumSize() const override;
+ void UpdateNewStyleAvatar() override;
// views::NonClientFrameView:
gfx::Rect GetBoundsForClientView() const override;
@@ -72,11 +70,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;
@@ -171,8 +164,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_;

Powered by Google App Engine
This is Rietveld 408576698