Index: ash/system/tray/system_tray.h |
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h |
index d78a13523fc2db460f11d868f63f69b5187cb296..9cd7969459ca4e541fbe2aa7a59b9941deb3cbd2 100644 |
--- a/ash/system/tray/system_tray.h |
+++ b/ash/system/tray/system_tray.h |
@@ -9,13 +9,13 @@ |
#include "ash/system/power/power_supply_status.h" |
#include "ash/system/tray/system_tray_bubble.h" |
#include "ash/system/tray/tray_background_view.h" |
-#include "ash/system/tray/tray_bubble_view.h" |
#include "ash/system/tray/tray_views.h" |
#include "ash/system/user/login_status.h" |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
+#include "ui/views/bubble/tray_bubble_view.h" |
#include "ui/views/view.h" |
#include <map> |
@@ -55,7 +55,7 @@ enum BubbleCreationType { |
}; |
class ASH_EXPORT SystemTray : public internal::TrayBackgroundView, |
- public message_center::TrayBubbleView::Delegate { |
+ public views::TrayBubbleView::Delegate { |
public: |
explicit SystemTray(internal::StatusAreaWidget* status_area_widget); |
virtual ~SystemTray(); |
@@ -176,7 +176,7 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView, |
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 message_center::TrayBubbleView::Delegate. |
@@ -187,8 +187,7 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView, |
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; |
private: |
// Returns true if the system_bubble_ exists and is of type |type|. |