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

Unified Diff: ash/system/web_notification/web_notification_tray.h

Issue 11684003: Make MessageCenter a singleton object and build on Windows. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update comment. Created 7 years, 12 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
« no previous file with comments | « no previous file | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/web_notification/web_notification_tray.h
diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h
index ffc34d87ece579b6737272d600aaf8378eea6e31..69e4e0b8588b14c7721e79e38d217e6655541c6e 100644
--- a/ash/system/web_notification/web_notification_tray.h
+++ b/ash/system/web_notification/web_notification_tray.h
@@ -51,7 +51,7 @@ class WebNotificationBubbleWrapper;
class ASH_EXPORT WebNotificationTray
: public internal::TrayBackgroundView,
public views::TrayBubbleView::Delegate,
- public message_center::MessageCenter::Host,
+ public message_center::MessageCenter::Observer,
public views::ButtonListener,
public views::WidgetObserver {
public:
@@ -71,7 +71,7 @@ class ASH_EXPORT WebNotificationTray
bool IsMouseInNotificationBubble() const;
message_center::MessageCenter* message_center() {
- return message_center_.get();
+ return message_center_;
}
// Overridden from TrayBackgroundView.
@@ -95,8 +95,8 @@ class ASH_EXPORT WebNotificationTray
AnchorAlignment anchor_alignment) OVERRIDE;
virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
- // Overridden from message_center::MessageCenter::Host.
- virtual void MessageCenterChanged(bool new_notification) OVERRIDE;
+ // Overridden from message_center::MessageCenter::Observer.
+ virtual void OnMessageCenterChanged(bool new_notification) OVERRIDE;
// Overridden from ButtonListener.
virtual void ButtonPressed(views::Button* sender,
@@ -152,7 +152,7 @@ class ASH_EXPORT WebNotificationTray
message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
message_center::MessagePopupBubble* GetPopupBubbleForTest();
- scoped_ptr<message_center::MessageCenter> message_center_;
+ message_center::MessageCenter* message_center_;
scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
scoped_ptr<message_center::QuietModeBubble> quiet_mode_bubble_;
« no previous file with comments | « no previous file | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698