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

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: Created 8 years 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: 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..34285df7e6b61657c09cea0bbfe3f1abd1986464 100644
--- a/ash/system/web_notification/web_notification_tray.h
+++ b/ash/system/web_notification/web_notification_tray.h
@@ -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.
@@ -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_;

Powered by Google App Engine
This is Rietveld 408576698