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

Unified Diff: ui/message_center/message_view.h

Issue 11229022: Move ash/system/web_notification message_center to ui/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 2 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 | « ui/message_center/message_popup_bubble.cc ('k') | ui/message_center/message_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/message_view.h
diff --git a/ash/system/web_notification/web_notification_view.h b/ui/message_center/message_view.h
similarity index 67%
rename from ash/system/web_notification/web_notification_view.h
rename to ui/message_center/message_view.h
index 2606166e61d051e4531c447d6e50abdc2e7f965d..94a268f756b3d96a606b46577848955ec8cb8262 100644
--- a/ash/system/web_notification/web_notification_view.h
+++ b/ui/message_center/message_view.h
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
-#define ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
+#ifndef UI_MESSAGE_CENTER_MESSAGE_VIEW_H_
+#define UI_MESSAGE_CENTER_MESSAGE_VIEW_H_
-#include "ash/system/web_notification/web_notification.h"
-#include "ash/system/web_notification/web_notification_list.h"
#include "ui/compositor/layer_animation_observer.h"
+#include "ui/message_center/notification_list.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/view.h"
@@ -25,15 +24,15 @@ const int kWebNotificationButtonWidth = 32;
const int kWebNotificationIconSize = 40;
// The view for a notification entry (icon + message + buttons).
-class WebNotificationView : public views::View,
- public views::ButtonListener,
- public ui::ImplicitAnimationObserver {
+class MessageView : public views::View,
+ public views::ButtonListener,
+ public ui::ImplicitAnimationObserver {
public:
- WebNotificationView(WebNotificationList::Delegate* list_delegate,
- const WebNotification& notification,
- int scroll_bar_width);
+ MessageView(NotificationList::Delegate* list_delegate,
+ const NotificationList::Notification& notification,
+ int scroll_bar_width);
- virtual ~WebNotificationView();
+ virtual ~MessageView();
void set_scroller(views::ScrollView* scroller) { scroller_ = scroller; }
@@ -65,17 +64,17 @@ class WebNotificationView : public views::View,
// Slides the view out and closes it after the animation.
void SlideOutAndClose(SlideDirection direction);
- WebNotificationList::Delegate* list_delegate_;
- WebNotification notification_;
+ NotificationList::Delegate* list_delegate_;
+ NotificationList::Notification notification_;
views::ImageView* icon_;
views::ImageButton* close_button_;
views::ScrollView* scroller_;
float gesture_scroll_amount_;
- DISALLOW_COPY_AND_ASSIGN(WebNotificationView);
+ DISALLOW_COPY_AND_ASSIGN(MessageView);
};
} // namespace message_center
-#endif // ASH_SYSTEM_WEB_NOTIFICATION_WEB_NOTIFICATION_VIEW_H_
+#endif // UI_MESSAGE_CENTER_MESSAGE_VIEW_H_
« no previous file with comments | « ui/message_center/message_popup_bubble.cc ('k') | ui/message_center/message_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698