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

Unified Diff: ui/message_center/message_view.h

Issue 11819048: Implement message center on Windows (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase on master @fa1d2262 and rearrange dependencies. Created 7 years, 11 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: ui/message_center/message_view.h
diff --git a/ui/message_center/message_view.h b/ui/message_center/message_view.h
index 3d113e383a3b3671ff30bf95b65238cf0ab2e3bd..ae7de37b96e6e87092026f79970ca2c70517a9e2 100644
--- a/ui/message_center/message_view.h
+++ b/ui/message_center/message_view.h
@@ -17,6 +17,12 @@ class ScrollView;
namespace message_center {
+#ifdef USE_AURA
+typedef views::SlideOutView MessageViewBase;
+#else
+typedef views::View MessageViewBase;
+#endif
+
// Individual notifications constants.
const int kPaddingBetweenItems = 10;
const int kPaddingHorizontal = 18;
@@ -25,8 +31,9 @@ const int kWebNotificationIconSize = 40;
const int kWebNotificationWidth = 300;
// An abstract class that forms the basis of a view for a notification entry.
-class MessageView : public views::SlideOutView,
- public views::ButtonListener {
+class MessageView
+ : public views::ButtonListener,
+ public MessageViewBase {
public:
MessageView(NotificationList::Delegate* list_delegate,
const NotificationList::Notification& notification);
@@ -55,8 +62,10 @@ class MessageView : public views::SlideOutView,
// Shows the menu for the notification.
void ShowMenu(gfx::Point screen_location);
+#ifdef USE_AURA
// Overridden from views::SlideOutView.
virtual void OnSlideOut() OVERRIDE;
+#endif
NotificationList::Delegate* list_delegate_;
NotificationList::Notification notification_;

Powered by Google App Engine
This is Rietveld 408576698