10 files changed, 11 insertions, 11 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index f26ba46..8807dd6 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -455,7 +455,7 @@ void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   }
 }
 
-bool SystemTray::PerformAction(const views::Event& event) {
+bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index e2c5d7c..d27bbc5 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -195,7 +195,7 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
   void UpdateNotificationAnchor();
 
   // Overridden from internal::ActionableView.
-  virtual bool PerformAction(const views::Event& event) OVERRIDE;
+  virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index 824a57c..9617a5a 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -160,7 +160,7 @@ void TrayBackgroundView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
-bool TrayBackgroundView::PerformAction(const views::Event& event) {
+bool TrayBackgroundView::PerformAction(const ui::Event& event) {
   return false;
 }
 
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index 123d398..15f20a9 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -64,7 +64,7 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
 
   // Overridden from internal::ActionableView.
-  virtual bool PerformAction(const views::Event& event) OVERRIDE;
+  virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from internal::BackgroundAnimatorDelegate.
   virtual void UpdateBackground(int alpha) OVERRIDE;
diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
index 8e71830..e4314e5 100644
--- a/ash/system/tray/tray_item_more.cc
+++ b/ash/system/tray/tray_item_more.cc
@@ -60,7 +60,7 @@ void TrayItemMore::ReplaceIcon(views::View* view) {
   AddChildViewAt(view, 0);
 }
 
-bool TrayItemMore::PerformAction(const views::Event& event) {
+bool TrayItemMore::PerformAction(const ui::Event& event) {
   owner_->TransitionDetailedView();
   return true;
 }
diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h
index f04c8dc..4b570fb 100644
--- a/ash/system/tray/tray_item_more.h
+++ b/ash/system/tray/tray_item_more.h
@@ -39,7 +39,7 @@ class TrayItemMore : public ActionableView {
 
  private:
   // Overridden from ActionableView.
-  virtual bool PerformAction(const views::Event& event) OVERRIDE;
+  virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual void Layout() OVERRIDE;
diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc
index 3e2c4cf..927d0e0 100644
--- a/ash/system/tray/tray_notification_view.cc
+++ b/ash/system/tray/tray_notification_view.cc
@@ -111,7 +111,7 @@ void TrayNotificationView::UpdateViewAndImage(views::View* new_contents,
 }
 
 void TrayNotificationView::ButtonPressed(views::Button* sender,
-                                         const views::Event& event) {
+                                         const ui::Event& event) {
   HandleClose();
 }
 
diff --git a/ash/system/tray/tray_notification_view.h b/ash/system/tray/tray_notification_view.h
index da49d05b..2dd64ad 100644
--- a/ash/system/tray/tray_notification_view.h
+++ b/ash/system/tray/tray_notification_view.h
@@ -50,7 +50,7 @@ class TrayNotificationView : public views::View,
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
-                             const views::Event& event) OVERRIDE;
+                             const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index aac21d3..402aa04 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -218,7 +218,7 @@ void HoverHighlightView::AddLabel(const string16& text,
   SetAccessibleName(text);
 }
 
-bool HoverHighlightView::PerformAction(const views::Event& event) {
+bool HoverHighlightView::PerformAction(const ui::Event& event) {
   if (!listener_)
     return false;
   listener_->ClickedOn(this);
diff --git a/ash/system/tray/tray_views.h b/ash/system/tray/tray_views.h
index 7f37bc6..fde20bf 100644
--- a/ash/system/tray/tray_views.h
+++ b/ash/system/tray/tray_views.h
@@ -71,7 +71,7 @@ class ASH_EXPORT ActionableView : public views::View {
   // Performs an action when user clicks on the view (on mouse-press event), or
   // presses a key when this view is in focus. Returns true if the event has
   // been handled and an action was performed. Returns false otherwise.
-  virtual bool PerformAction(const views::Event& event) = 0;
+  virtual bool PerformAction(const ui::Event& event) = 0;
 
   // Overridden from views::View.
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
@@ -122,7 +122,7 @@ class HoverHighlightView : public ActionableView {
 
  private:
   // Overridden from ActionableView.
-  virtual bool PerformAction(const views::Event& event) OVERRIDE;
+  virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE;