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

Unified Diff: ash/system/web_notification/web_notification_tray.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
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 edf1bf729c14748184c21566324cfd0611733f15..3b8cb9f6f3824330ed87bca3a9b7bac847fd2804 100644
--- a/ash/system/web_notification/web_notification_tray.h
+++ b/ash/system/web_notification/web_notification_tray.h
@@ -9,8 +9,8 @@
#include "ash/system/tray/tray_background_view.h"
#include "ash/system/tray/tray_views.h"
#include "ash/system/user/login_status.h"
-#include "ash/system/web_notification/message_center.h"
#include "base/gtest_prod_util.h"
+#include "ui/message_center/message_center.h"
// Status area tray for showing browser and app notifications. This hosts
// a MessageCenter class which manages the notification list. This class
@@ -34,7 +34,7 @@ class ImageButton;
namespace message_center {
class MessageCenterBubble;
-class PopupBubble;
+class MessagePopupBubble;
}
namespace ash {
@@ -46,7 +46,7 @@ class WebNotificationBubbleWrapper;
class ASH_EXPORT WebNotificationTray
: public internal::TrayBackgroundView,
- public message_center::TrayBubbleView::Delegate,
+ public views::TrayBubbleView::Delegate,
public message_center::MessageCenter::Host,
public views::ButtonListener {
public:
@@ -74,13 +74,13 @@ class ASH_EXPORT WebNotificationTray
virtual void AnchorUpdated() OVERRIDE;
virtual string16 GetAccessibleNameForTray() OVERRIDE;
virtual void HideBubbleWithView(
- const message_center::TrayBubbleView* bubble_view) OVERRIDE;
+ const views::TrayBubbleView* bubble_view) OVERRIDE;
virtual bool ClickedOutsideBubble() OVERRIDE;
// Overridden from internal::ActionableView.
virtual bool PerformAction(const ui::Event& event) OVERRIDE;
- // Overridden from message_center::TrayBubbleView::Delegate.
+ // Overridden from views::TrayBubbleView::Delegate.
virtual void BubbleViewDestroyed() OVERRIDE;
virtual void OnMouseEnteredView() OVERRIDE;
virtual void OnMouseExitedView() OVERRIDE;
@@ -88,8 +88,7 @@ class ASH_EXPORT WebNotificationTray
virtual gfx::Rect GetAnchorRect(views::Widget* anchor_widget,
AnchorType anchor_type,
AnchorAlignment anchor_alignment) OVERRIDE;
- virtual void HideBubble(
- const message_center::TrayBubbleView* bubble_view) OVERRIDE;
+ virtual void HideBubble(const views::TrayBubbleView* bubble_view) OVERRIDE;
// Overridden from message_center::MessageCenter::Host.
virtual void MessageCenterChanged(bool new_notification) OVERRIDE;
@@ -133,7 +132,7 @@ class ASH_EXPORT WebNotificationTray
// Testing accessors.
message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
- message_center::PopupBubble* GetPopupBubbleForTest();
+ message_center::MessagePopupBubble* GetPopupBubbleForTest();
scoped_ptr<message_center::MessageCenter> message_center_;
scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
« no previous file with comments | « ash/system/web_notification/web_notification_list.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698