diff options
228 files changed, 320 insertions, 399 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 9ce72b2..7334eed 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -988,7 +988,7 @@ string16 LauncherView::GetAccessibleName(const views::View* view) { } void LauncherView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { // Do not handle mouse release during drag. if (dragging()) return; diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h index 3978142..74e2ff2 100644 --- a/ash/launcher/launcher_view.h +++ b/ash/launcher/launcher_view.h @@ -203,7 +203,7 @@ class ASH_EXPORT LauncherView : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index 6b72fce..56c0f27 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -68,7 +68,7 @@ class LockView : public views::WidgetDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { DCHECK(sender == unlock_button_); GetWidget()->Close(); } diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index b783518..c8be3bb 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -96,7 +96,7 @@ class ModalWindow : public views::WidgetDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { DCHECK(sender == open_button_); OpenModalWindow(GetWidget()->GetNativeView(), modal_type_); } @@ -287,7 +287,7 @@ bool WindowTypeLauncher::CanMaximize() const { } void WindowTypeLauncher::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == create_button_) { ToplevelWindow::CreateParams params; params.can_resize = true; diff --git a/ash/shell/window_type_launcher.h b/ash/shell/window_type_launcher.h index abbf0e3..a6db81f 100644 --- a/ash/shell/window_type_launcher.h +++ b/ash/shell/window_type_launcher.h @@ -53,7 +53,7 @@ class WindowTypeLauncher : public views::WidgetDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; #if !defined(OS_MACOSX) // Overridden from views::MenuDelegate: diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc index 6a24a4e..7b32718 100644 --- a/ash/system/audio/tray_volume.cc +++ b/ash/system/audio/tray_volume.cc @@ -177,7 +177,7 @@ class VolumeView : public views::View, // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { CHECK(sender == icon_ || sender == mute_); ash::SystemTrayDelegate* delegate = ash::Shell::GetInstance()->tray_delegate(); diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc index 3b08665..bc8b3db 100644 --- a/ash/system/bluetooth/tray_bluetooth.cc +++ b/ash/system/bluetooth/tray_bluetooth.cc @@ -159,7 +159,7 @@ class BluetoothDetailedView : public TrayDetailsView, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { ash::SystemTrayDelegate* delegate = ash::Shell::GetInstance()->tray_delegate(); if (sender == toggle_bluetooth_) diff --git a/ash/system/date/date_view.cc b/ash/system/date/date_view.cc index e5defba..29a0492 100644 --- a/ash/system/date/date_view.cc +++ b/ash/system/date/date_view.cc @@ -134,7 +134,7 @@ void DateView::UpdateTextInternal(const base::Time& now) { day_of_week_label_->SetText(FormatDayOfWeek(now)); } -bool DateView::PerformAction(const views::Event& event) { +bool DateView::PerformAction(const ui::Event& event) { if (!actionable_) return false; @@ -194,7 +194,7 @@ void TimeView::UpdateTextInternal(const base::Time& now) { Layout(); } -bool TimeView::PerformAction(const views::Event& event) { +bool TimeView::PerformAction(const ui::Event& event) { return false; } diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h index 98c5b9d1..bb38641 100644 --- a/ash/system/date/date_view.h +++ b/ash/system/date/date_view.h @@ -64,7 +64,7 @@ class DateView : public BaseDateTimeView { virtual void UpdateTextInternal(const base::Time& now) OVERRIDE; // 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 OnMouseEntered(const views::MouseEvent& event) OVERRIDE; @@ -101,7 +101,7 @@ class TimeView : public BaseDateTimeView { virtual void UpdateTextInternal(const base::Time& now) OVERRIDE; // Overridden from ActionableView. - virtual bool PerformAction(const views::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) OVERRIDE; // Overridden from views::View. virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index bb066e3..6826721 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -101,7 +101,7 @@ class DateDefaultView : public views::View, private: // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { ash::SystemTrayDelegate* tray = ash::Shell::GetInstance()->tray_delegate(); if (sender == help_) tray->ShowHelp(); diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc index a81ca83..1d90741 100644 --- a/ash/system/drive/tray_drive.cc +++ b/ash/system/drive/tray_drive.cc @@ -244,7 +244,7 @@ class DriveDetailedView : public TrayDetailsView, // views::ButtonListener overrides. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { DCHECK(sender == cancel_button_); container_->OnCancelOperation(file_path_); } diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc index db6bc2a..fc23759 100644 --- a/ash/system/network/tray_network.cc +++ b/ash/system/network/tray_network.cc @@ -548,7 +548,7 @@ class NetworkListDetailedView : public NetworkDetailedView, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { ash::SystemTrayDelegate* delegate = ash::Shell::GetInstance()->tray_delegate(); if (sender == info_icon_) { diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc index 3e3f7c4..b7680b1 100644 --- a/ash/system/network/tray_sms.cc +++ b/ash/system/network/tray_sms.cc @@ -113,7 +113,7 @@ class TraySms::SmsMessageView : public views::View, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { tray_->RemoveMessage(index_); tray_->Update(false); } diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc index 28ef4e0..c28a3ea 100644 --- a/ash/system/settings/tray_settings.cc +++ b/ash/system/settings/tray_settings.cc @@ -70,7 +70,7 @@ class SettingsDefaultView : public ash::internal::ActionableView { } // Overridden from ash::internal::ActionableView. - virtual bool PerformAction(const views::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) OVERRIDE { if (login_status_ == user::LOGGED_IN_NONE || login_status_ == user::LOGGED_IN_LOCKED) return false; 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; diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc index 39fdc1b..95adc42 100644 --- a/ash/system/tray_accessibility.cc +++ b/ash/system/tray_accessibility.cc @@ -45,7 +45,7 @@ class DefaultAccessibilityView : public ActionableView { protected: // Overridden from ActionableView. - virtual bool PerformAction(const views::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) OVERRIDE { if (Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled()) Shell::GetInstance()->delegate()->ToggleSpokenFeedback(); GetWidget()->Close(); diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc index 01d572e..379845c 100644 --- a/ash/system/tray_caps_lock.cc +++ b/ash/system/tray_caps_lock.cc @@ -84,7 +84,7 @@ class CapsLockDefaultView : public ActionableView { } // Overridden from ActionableView: - virtual bool PerformAction(const views::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) OVERRIDE { Shell::GetInstance()->tray_delegate()->SetCapsLockEnabled( !Shell::GetInstance()->tray_delegate()->IsCapsLockOn()); return true; diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc index 82957f0..29e5512 100644 --- a/ash/system/tray_update.cc +++ b/ash/system/tray_update.cc @@ -57,7 +57,7 @@ class UpdateView : public ash::internal::ActionableView { private: // Overridden from ActionableView. - virtual bool PerformAction(const views::Event& event) OVERRIDE { + virtual bool PerformAction(const ui::Event& event) OVERRIDE { ash::Shell::GetInstance()->tray_delegate()->RequestRestart(); return true; } diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index 325d5e7..6573fcb 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -187,7 +187,7 @@ class UserView : public views::View, // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { CHECK(sender == signout_); ash::SystemTrayDelegate* tray = ash::Shell::GetInstance()->tray_delegate(); tray->SignOut(); diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 10b9c88..11f1773 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -445,7 +445,7 @@ class WebNotificationView : public views::View, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { if (sender == close_button_) tray_->SendRemoveNotification(notification_.id); } @@ -519,7 +519,7 @@ class WebNotificationButtonView : public views::View, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { if (sender == close_all_button_) tray_->SendRemoveAllNotifications(); } @@ -1007,7 +1007,7 @@ void WebNotificationTray::DisableByUrl(const std::string& id) { delegate_->DisableNotificationsFromSource(id); } -bool WebNotificationTray::PerformAction(const views::Event& event) { +bool WebNotificationTray::PerformAction(const ui::Event& event) { if (message_center_bubble()) HideMessageCenterBubble(); else diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h index deb87a9..cf0f829 100644 --- a/ash/system/web_notification/web_notification_tray.h +++ b/ash/system/web_notification/web_notification_tray.h @@ -120,7 +120,7 @@ class ASH_EXPORT WebNotificationTray : public internal::TrayBackgroundView { virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE; // Overridden from internal::ActionableView. - virtual bool PerformAction(const views::Event& event) OVERRIDE; + virtual bool PerformAction(const ui::Event& event) OVERRIDE; protected: // Send a remove request to the delegate. diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc index 3132e7f..aa0186d 100644 --- a/ash/wm/custom_frame_view_ash.cc +++ b/ash/wm/custom_frame_view_ash.cc @@ -144,7 +144,7 @@ gfx::Size CustomFrameViewAsh::GetMinimumSize() { //////////////////////////////////////////////////////////////////////////////// // views::ButtonListener overrides: void CustomFrameViewAsh::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == maximize_button_) { // The maximize button may move out from under the cursor. ResetWindowControls(); diff --git a/ash/wm/custom_frame_view_ash.h b/ash/wm/custom_frame_view_ash.h index 8f103fe..c875874 100644 --- a/ash/wm/custom_frame_view_ash.h +++ b/ash/wm/custom_frame_view_ash.h @@ -72,7 +72,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView, // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; private: // Height from top of window to top of client area. diff --git a/ash/wm/dialog_frame_view.cc b/ash/wm/dialog_frame_view.cc index 7eef586..dd5fd8b 100644 --- a/ash/wm/dialog_frame_view.cc +++ b/ash/wm/dialog_frame_view.cc @@ -152,7 +152,7 @@ void DialogFrameView::OnPaint(gfx::Canvas* canvas) { // DialogFrameView, views::ButtonListener overrides: void DialogFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) GetWidget()->Close(); } diff --git a/ash/wm/dialog_frame_view.h b/ash/wm/dialog_frame_view.h index 23c1959..207e793 100644 --- a/ash/wm/dialog_frame_view.h +++ b/ash/wm/dialog_frame_view.h @@ -46,7 +46,7 @@ class DialogFrameView : public views::NonClientFrameView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; private: gfx::Insets GetPaddingInsets() const; diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc index 61c5f32..21c3136 100644 --- a/ash/wm/maximize_bubble_controller.cc +++ b/ash/wm/maximize_bubble_controller.cc @@ -292,7 +292,7 @@ class BubbleContentsButtonRow : public views::View, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Called from BubbleDialogButton. void ButtonHovered(BubbleDialogButton* sender); @@ -557,7 +557,7 @@ BubbleContentsButtonRow::BubbleContentsButtonRow( // Overridden from ButtonListener. void BubbleContentsButtonRow::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { // While shutting down, the connection to the owner might already be broken. if (!bubble_->controller()) return; diff --git a/ash/wm/panel_frame_view.cc b/ash/wm/panel_frame_view.cc index e0d93e2..90a79b3 100644 --- a/ash/wm/panel_frame_view.cc +++ b/ash/wm/panel_frame_view.cc @@ -87,7 +87,7 @@ gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds( } void PanelFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) GetWidget()->Close(); } diff --git a/ash/wm/panel_frame_view.h b/ash/wm/panel_frame_view.h index a0b410e..3329de2 100644 --- a/ash/wm/panel_frame_view.h +++ b/ash/wm/panel_frame_view.h @@ -42,7 +42,7 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Child View class describing the panel's title bar behavior // and buttons, owned by the view hierarchy diff --git a/chrome/browser/chromeos/login/message_bubble.cc b/chrome/browser/chromeos/login/message_bubble.cc index cbf66f8..47a2850 100644 --- a/chrome/browser/chromeos/login/message_bubble.cc +++ b/chrome/browser/chromeos/login/message_bubble.cc @@ -99,7 +99,7 @@ void MessageBubble::Init() { } void MessageBubble::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) { GetWidget()->Close(); } else { diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h index f74dc09..52835d74 100644 --- a/chrome/browser/chromeos/login/message_bubble.h +++ b/chrome/browser/chromeos/login/message_bubble.h @@ -55,7 +55,7 @@ class MessageBubble : public views::BubbleDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::LinkListener: virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc index bafb375..d426953 100644 --- a/chrome/browser/chromeos/login/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc @@ -39,7 +39,7 @@ using views::Button; class DummyButtonListener : public views::ButtonListener { public: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) {} + const ui::Event& event) {} }; class NetworkScreenTest : public WizardInProcessBrowserTest { diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index 40ad790..2d0df3d 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -200,7 +200,7 @@ bool PasswordChangedView::ExitDialog() { } void PasswordChangedView::ButtonPressed(Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == full_sync_radio_) { old_password_field_->SetEnabled(false); old_password_field_->SetText(string16()); diff --git a/chrome/browser/chromeos/login/password_changed_view.h b/chrome/browser/chromeos/login/password_changed_view.h index 7ea478a..f09f832 100644 --- a/chrome/browser/chromeos/login/password_changed_view.h +++ b/chrome/browser/chromeos/login/password_changed_view.h @@ -61,7 +61,7 @@ class PasswordChangedView : public views::DialogDelegateView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog.cc b/chrome/browser/chromeos/login/simple_web_view_dialog.cc index 0a597c7..57f9f65 100644 --- a/chrome/browser/chromeos/login/simple_web_view_dialog.cc +++ b/chrome/browser/chromeos/login/simple_web_view_dialog.cc @@ -245,7 +245,7 @@ views::View* SimpleWebViewDialog::GetInitiallyFocusedView() { } void SimpleWebViewDialog::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { command_updater_->ExecuteCommand(sender->tag()); } diff --git a/chrome/browser/chromeos/login/simple_web_view_dialog.h b/chrome/browser/chromeos/login/simple_web_view_dialog.h index 79e55c9..26b2f30 100644 --- a/chrome/browser/chromeos/login/simple_web_view_dialog.h +++ b/chrome/browser/chromeos/login/simple_web_view_dialog.h @@ -58,7 +58,7 @@ class SimpleWebViewDialog : public views::ButtonListener, // Implements views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Implements content::PageNavigator: virtual content::WebContents* OpenURL( diff --git a/chrome/browser/chromeos/login/take_photo_view.cc b/chrome/browser/chromeos/login/take_photo_view.cc index 62300de..7967331 100644 --- a/chrome/browser/chromeos/login/take_photo_view.cc +++ b/chrome/browser/chromeos/login/take_photo_view.cc @@ -280,7 +280,7 @@ gfx::Size TakePhotoView::GetPreferredSize() { } void TakePhotoView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { DCHECK(delegate_); DCHECK(sender == snapshot_button_); FlipCapturingState(); diff --git a/chrome/browser/chromeos/login/take_photo_view.h b/chrome/browser/chromeos/login/take_photo_view.h index e29df5d..e559857 100644 --- a/chrome/browser/chromeos/login/take_photo_view.h +++ b/chrome/browser/chromeos/login/take_photo_view.h @@ -72,7 +72,7 @@ class TakePhotoView : public views::View, // Overridden from views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; bool is_capturing() const { return is_capturing_; } diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index e519af1..70bb8ab8 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -194,7 +194,7 @@ void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) { } void NetworkConfigView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (advanced_button_ && sender == advanced_button_) { advanced_button_->SetVisible(false); ShowAdvancedView(); diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h index 7000b27..cb3b880 100644 --- a/chrome/browser/chromeos/options/network_config_view.h +++ b/chrome/browser/chromeos/options/network_config_view.h @@ -70,7 +70,7 @@ class NetworkConfigView : public views::DialogDelegateView, // views::ButtonListener overrides. virtual void ButtonPressed( - views::Button* sender, const views::Event& event) OVERRIDE; + views::Button* sender, const ui::Event& event) OVERRIDE; void set_delegate(Delegate* delegate) { delegate_ = delegate; diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index c81e53a..af4a151 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -278,7 +278,7 @@ bool VPNConfigView::HandleKeyEvent(views::Textfield* sender, } void VPNConfigView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { } void VPNConfigView::OnSelectedIndexChanged(views::Combobox* combobox) { diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h index 1ce375f..e868884 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.h +++ b/chrome/browser/chromeos/options/vpn_config_view.h @@ -48,7 +48,7 @@ class VPNConfigView : public ChildNetworkConfigView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::ComboboxListener: virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE; diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 3d66449..dfbb467 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -618,7 +618,7 @@ bool WifiConfigView::HandleKeyEvent(views::Textfield* sender, } void WifiConfigView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == passphrase_visible_button_) { if (passphrase_textfield_) { passphrase_textfield_->SetObscured(!passphrase_textfield_->IsObscured()); diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h index 635ff7a..3270eb0 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.h +++ b/chrome/browser/chromeos/options/wifi_config_view.h @@ -57,7 +57,7 @@ class WifiConfigView : public ChildNetworkConfigView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::ComboboxListener: virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE; diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc index 77929f6..ceecff9 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.cc +++ b/chrome/browser/chromeos/options/wimax_config_view.cc @@ -120,7 +120,7 @@ bool WimaxConfigView::HandleKeyEvent(views::Textfield* sender, } void WimaxConfigView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == passphrase_visible_button_) { if (passphrase_textfield_) { passphrase_textfield_->SetObscured(!passphrase_textfield_->IsObscured()); diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h index 55ec0a8..4a5df4e 100644 --- a/chrome/browser/chromeos/options/wimax_config_view.h +++ b/chrome/browser/chromeos/options/wimax_config_view.h @@ -42,7 +42,7 @@ class WimaxConfigView : public ChildNetworkConfigView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // ChildNetworkConfigView: virtual views::View* GetInitiallyFocusedView() OVERRIDE; diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index be3c7dd..bf6460f 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -304,7 +304,7 @@ void TryChromeDialogView::SetToastRegion(HWND window, int w, int h) { } void TryChromeDialogView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender->tag() == BT_DONT_BUG_RADIO) { if (make_default_) { make_default_->SetChecked(false); diff --git a/chrome/browser/first_run/try_chrome_dialog_view.h b/chrome/browser/first_run/try_chrome_dialog_view.h index d0a5aa5..97c0df7 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.h +++ b/chrome/browser/first_run/try_chrome_dialog_view.h @@ -89,7 +89,7 @@ class TryChromeDialogView : public views::ButtonListener, // We have two buttons and according to what the user clicked we set |result_| // and we should always close and end the modal loop. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener: // If the user selects the link we need to fire off the default browser that diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc index eade1d5..87cac81 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc @@ -561,7 +561,7 @@ void PanelBrowserFrameView::OnMouseCaptureLost() { } void PanelBrowserFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) { frame()->Close(); } else { diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.h b/chrome/browser/ui/panels/panel_browser_frame_view.h index d50209a..26864b7a 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.h +++ b/chrome/browser/ui/panels/panel_browser_frame_view.h @@ -79,7 +79,7 @@ class PanelBrowserFrameView : public BrowserNonClientFrameView, virtual void OnMouseCaptureLost() OVERRIDE; // Overridden from views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, const views::Event& event) + virtual void ButtonPressed(views::Button* sender, const ui::Event& event) OVERRIDE; // Overridden from chrome::TabIconViewModel: diff --git a/chrome/browser/ui/panels/panel_frame_view.cc b/chrome/browser/ui/panels/panel_frame_view.cc index 5eee67d..e0b9f9b 100644 --- a/chrome/browser/ui/panels/panel_frame_view.cc +++ b/chrome/browser/ui/panels/panel_frame_view.cc @@ -466,7 +466,7 @@ void PanelFrameView::OnMouseCaptureLost() { } void PanelFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) { panel_view_->ClosePanel(); } else { diff --git a/chrome/browser/ui/panels/panel_frame_view.h b/chrome/browser/ui/panels/panel_frame_view.h index ba50b60..41773ed 100644 --- a/chrome/browser/ui/panels/panel_frame_view.h +++ b/chrome/browser/ui/panels/panel_frame_view.h @@ -74,7 +74,7 @@ class PanelFrameView : public views::NonClientFrameView, virtual void OnMouseCaptureLost() OVERRIDE; // Overridden from views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, const views::Event& event) + virtual void ButtonPressed(views::Button* sender, const ui::Event& event) OVERRIDE; // Overridden from chrome::TabIconViewModel: diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc index a0b2832..67d56b3 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.cc +++ b/chrome/browser/ui/views/about_ipc_dialog.cc @@ -347,7 +347,7 @@ bool AboutIPCDialog::CanResize() const { } void AboutIPCDialog::ButtonPressed( - views::Button* button, const views::Event& event) { + views::Button* button, const ui::Event& event) { if (button == track_toggle_) { if (tracking_) { track_toggle_->SetText(kStartTrackingLabel); diff --git a/chrome/browser/ui/views/about_ipc_dialog.h b/chrome/browser/ui/views/about_ipc_dialog.h index 60c0dc67..6fce3f2 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.h +++ b/chrome/browser/ui/views/about_ipc_dialog.h @@ -58,7 +58,7 @@ class AboutIPCDialog : public views::DialogDelegateView, // views::ButtonListener. virtual void ButtonPressed(views::Button* button, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; WTL::CListViewCtrl message_list_; diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc index 457da89..3d91276 100644 --- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc @@ -370,7 +370,7 @@ gfx::Size BrowserNonClientFrameViewAsh::GetMinimumSize() { // views::ButtonListener overrides: void BrowserNonClientFrameViewAsh::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { // When shift-clicking slow down animations for visual debugging. // We used to do this via an event filter that looked for the shift key being // pressed but this interfered with several normal keyboard shortcuts. diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h index 9826119..1374b5a 100644 --- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h +++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h @@ -61,7 +61,7 @@ class BrowserNonClientFrameViewAsh // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from chrome::TabIconViewModel: virtual bool ShouldTabIconViewAnimate() const OVERRIDE; diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc index 02d834c..79b1d0c 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc @@ -484,7 +484,7 @@ bool AvatarMenuBubbleView::AcceleratorPressed( } void AvatarMenuBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { for (size_t i = 0; i < item_views_.size(); ++i) { ProfileItemView* item_view = static_cast<ProfileItemView*>(item_views_[i]); if (sender == item_view) { diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.h b/chrome/browser/ui/views/avatar_menu_bubble_view.h index b5fc9f1..5490ac2 100644 --- a/chrome/browser/ui/views/avatar_menu_bubble_view.h +++ b/chrome/browser/ui/views/avatar_menu_bubble_view.h @@ -43,7 +43,7 @@ class AvatarMenuBubbleView : public views::BubbleDelegateView, // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener implementation. virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 14ab3de..60c172a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -168,7 +168,7 @@ class BookmarkButton : public views::TextButton { return !tooltip->empty(); } - virtual bool IsTriggerableEvent(const views::Event& e) OVERRIDE { + virtual bool IsTriggerableEvent(const ui::Event& e) OVERRIDE { return e.type() == ui::ET_GESTURE_TAP || e.type() == ui::ET_GESTURE_TAP_DOWN || event_utils::IsPossibleDispositionEvent(e); @@ -218,7 +218,7 @@ class BookmarkFolderButton : public views::MenuButton { return !tooltip->empty(); } - virtual bool IsTriggerableEvent(const views::Event& e) OVERRIDE { + virtual bool IsTriggerableEvent(const ui::Event& e) OVERRIDE { // Left clicks and taps should show the menu contents and right clicks // should show the context menu. They should not trigger the opening of // underlying urls. @@ -1029,7 +1029,7 @@ void BookmarkBarView::OnMenuButtonClicked(views::View* view, } void BookmarkBarView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { const BookmarkNode* node; if (sender->tag() == kOtherFolderButtonTag) { node = model_->other_node(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 33861c5..52b3e81 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -231,7 +231,7 @@ class BookmarkBarView : public DetachableToolbarView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 62279b2..ad85216d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -278,7 +278,7 @@ string16 BookmarkBubbleView::GetTitle() { } void BookmarkBubbleView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { HandleButtonPressed(sender); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index 8de0f96..5d1fa6e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -74,7 +74,7 @@ class BookmarkBubbleView : public views::BubbleDelegateView, // Overridden from views::ButtonListener: // Closes the bubble or opens the edit dialog. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::ComboboxListener: virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 5c0acb8..83b8f44 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -201,7 +201,7 @@ bool BookmarkEditorView::HandleKeyEvent(views::Textfield* sender, } void BookmarkEditorView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { DCHECK_EQ(new_folder_button_.get(), sender); NewFolder(); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index 63122f7..82a0d35 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -107,7 +107,7 @@ class BookmarkEditorView : public BookmarkEditor, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // ui::SimpleMenuModel::Delegate: virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index 2c012a0..c392b90 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -93,7 +93,7 @@ string16 BookmarkMenuController::GetTooltipText(int id, } bool BookmarkMenuController::IsTriggerableEvent(views::MenuItemView* menu, - const views::Event& e) { + const ui::Event& e) { return menu_delegate_->IsTriggerableEvent(menu, e); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index 3ff95ae..f83ef5e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h @@ -78,7 +78,7 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, // MenuDelegate methods. virtual string16 GetTooltipText(int id, const gfx::Point& p) const OVERRIDE; virtual bool IsTriggerableEvent(views::MenuItemView* view, - const views::Event& e) OVERRIDE; + const ui::Event& e) OVERRIDE; virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; virtual bool GetDropFormats( views::MenuItemView* menu, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 4166234..d236505 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -115,7 +115,7 @@ string16 BookmarkMenuDelegate::GetTooltipText( } bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu, - const views::Event& e) { + const ui::Event& e) { return e.type() == ui::ET_GESTURE_TAP || e.type() == ui::ET_GESTURE_TAP_DOWN || event_utils::IsPossibleDispositionEvent(e); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index cb0fb66..5b57672 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h @@ -93,7 +93,7 @@ class BookmarkMenuDelegate : public BaseBookmarkModelObserver, // MenuDelegate like methods (see class description for details). string16 GetTooltipText(int id, const gfx::Point& p) const; bool IsTriggerableEvent(views::MenuItemView* menu, - const views::Event& e); + const ui::Event& e); void ExecuteCommand(int id, int mouse_event_flags); bool GetDropFormats( views::MenuItemView* menu, diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc index 01877ec..f4275e6 100644 --- a/chrome/browser/ui/views/browser_action_view.cc +++ b/chrome/browser/ui/views/browser_action_view.cc @@ -205,7 +205,7 @@ void BrowserActionButton::GetAccessibleState(ui::AccessibleViewState* state) { } void BrowserActionButton::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { delegate_->OnBrowserActionExecuted(this); } diff --git a/chrome/browser/ui/views/browser_action_view.h b/chrome/browser/ui/views/browser_action_view.h index e8a89aa..528278d 100644 --- a/chrome/browser/ui/views/browser_action_view.h +++ b/chrome/browser/ui/views/browser_action_view.h @@ -132,7 +132,7 @@ class BrowserActionButton : public views::MenuButton, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::ContextMenuController. virtual void ShowContextMenuForView(View* source, diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc index f881633..8055b6a 100644 --- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc +++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc @@ -180,7 +180,7 @@ void ChromeToMobileBubbleView::AnimationProgressed( } void ChromeToMobileBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { HandleButtonPressed(sender); } diff --git a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.h b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.h index 9fd7e8f..af49d5a 100644 --- a/chrome/browser/ui/views/chrome_to_mobile_bubble_view.h +++ b/chrome/browser/ui/views/chrome_to_mobile_bubble_view.h @@ -53,7 +53,7 @@ class ChromeToMobileBubbleView : public views::BubbleDelegateView, // views::ButtonListener method. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener method. virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index a7c4480..614e967 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc @@ -239,7 +239,7 @@ views::View* CollectedCookiesViews::GetContentsView() { // CollectedCookiesViews, views::ButtonListener implementation: void CollectedCookiesViews::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == block_allowed_button_) AddContentException(allowed_cookies_tree_, CONTENT_SETTING_BLOCK); else if (sender == allow_blocked_button_) diff --git a/chrome/browser/ui/views/collected_cookies_views.h b/chrome/browser/ui/views/collected_cookies_views.h index d248e65..bcd5729a 100644 --- a/chrome/browser/ui/views/collected_cookies_views.h +++ b/chrome/browser/ui/views/collected_cookies_views.h @@ -50,7 +50,7 @@ class CollectedCookiesViews : public views::DialogDelegateView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::TabbedPaneListener: virtual void TabSelectedAt(int index) OVERRIDE; diff --git a/chrome/browser/ui/views/confirm_bubble_views.cc b/chrome/browser/ui/views/confirm_bubble_views.cc index f86a865..5e8ab00 100644 --- a/chrome/browser/ui/views/confirm_bubble_views.cc +++ b/chrome/browser/ui/views/confirm_bubble_views.cc @@ -38,7 +38,7 @@ ConfirmBubbleViews::~ConfirmBubbleViews() { } void ConfirmBubbleViews::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender->tag() == ConfirmBubbleModel::BUTTON_OK) model_->Accept(); else if (sender->tag() == ConfirmBubbleModel::BUTTON_CANCEL) diff --git a/chrome/browser/ui/views/confirm_bubble_views.h b/chrome/browser/ui/views/confirm_bubble_views.h index 96e457c..4ff626ba 100644 --- a/chrome/browser/ui/views/confirm_bubble_views.h +++ b/chrome/browser/ui/views/confirm_bubble_views.h @@ -44,7 +44,7 @@ class ConfirmBubbleViews : public views::BubbleDelegateView, // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener implementation. virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 18b4202..964b3b9 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -187,7 +187,7 @@ class ConstrainedWindowFrameView : public views::NonClientFrameView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; private: // Returns the thickness of the entire nonclient left, right, and bottom @@ -390,7 +390,7 @@ void ConstrainedWindowFrameView::OnThemeChanged() { // ConstrainedWindowFrameView, views::ButtonListener implementation: void ConstrainedWindowFrameView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { if (sender == close_button_) container_->CloseConstrainedWindow(); } @@ -559,7 +559,7 @@ class ConstrainedWindowFrameViewAsh : public ash::CustomFrameViewAsh { // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { if (sender == close_button()) container_->CloseConstrainedWindow(); } diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index 34d6379..2cd517b 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -286,7 +286,7 @@ void ContentSettingBubbleContents::Init() { } void ContentSettingBubbleContents::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) { content_setting_bubble_model_->OnDoneClicked(); StartFade(false); diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h index 0015d7d..c4b0cf1 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.h +++ b/chrome/browser/ui/views/content_setting_bubble_contents.h @@ -67,7 +67,7 @@ class ContentSettingBubbleContents : public views::BubbleDelegateView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener: virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 90d1c33..c80a6fe 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -399,7 +399,7 @@ views::Checkbox* CreateApplicationShortcutView::AddCheckbox( } void CreateApplicationShortcutView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == desktop_check_box_) profile_->GetPrefs()->SetBoolean(prefs::kWebAppCreateOnDesktop, desktop_check_box_->checked() ? true : false); diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index 1cc858e..17398b7 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h @@ -56,7 +56,7 @@ class CreateApplicationShortcutView : public views::DialogDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; protected: // Adds a new check-box as a child to the view. diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index ca2d790..3ef8d32 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -109,7 +109,7 @@ void CriticalNotificationBubbleView::OnCountdown() { } void CriticalNotificationBubbleView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { // Let other bubbles know we have an answer from the user. UpgradeDetector::GetInstance()->acknowledge_critical_update(); diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h index 8fce7bb..2b6b4d1 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.h +++ b/chrome/browser/ui/views/critical_notification_bubble_view.h @@ -26,7 +26,7 @@ class CriticalNotificationBubbleView : public views::BubbleDelegateView, // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::WidgetDelegate overrides: virtual void WindowClosing() OVERRIDE; diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 5917852..4ed8870 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -543,7 +543,7 @@ void DownloadItemView::ShowContextMenuForView(View* source, } void DownloadItemView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { if (sender == discard_button_) { UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", base::Time::Now() - creation_time_); diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index 83224f6..6ce88d8 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -102,7 +102,7 @@ class DownloadItemView : public views::ButtonListener, // ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // ui::AnimationDelegate implementation. virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index 5a30205..13724b9 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc @@ -384,7 +384,7 @@ void DownloadShelfView::LinkClicked(views::Link* source, int event_flags) { } void DownloadShelfView::ButtonPressed( - views::Button* button, const views::Event& event) { + views::Button* button, const ui::Event& event) { auto_closed_ = false; Close(); } diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index ecd68d0..15e8776 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.h +++ b/chrome/browser/ui/views/download/download_shelf_view.h @@ -76,7 +76,7 @@ class DownloadShelfView : public views::AccessiblePaneView, // Invoked when the user clicks the close button. Asks the browser to // hide the download shelf. virtual void ButtonPressed(views::Button* button, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Implementation of DownloadShelf. virtual bool IsShowing() const OVERRIDE; diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index d91db40..4a275cb 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/event_utils.h" -#include "ui/views/events/event.h" +#include "ui/base/event.h" namespace event_utils { -bool IsPossibleDispositionEvent(const views::Event& event) { +bool IsPossibleDispositionEvent(const ui::Event& event) { return event.IsMouseEvent() && (event.flags() & (ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON)); } diff --git a/chrome/browser/ui/views/event_utils.h b/chrome/browser/ui/views/event_utils.h index 8c30744..a933c37 100644 --- a/chrome/browser/ui/views/event_utils.h +++ b/chrome/browser/ui/views/event_utils.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EVENT_UTILS_H_ #define CHROME_BROWSER_UI_VIEWS_EVENT_UTILS_H_ -namespace views { +namespace ui { class Event; } @@ -13,7 +13,7 @@ namespace event_utils { // Returns true if the specified event may have a // WindowOptionDisposition. -bool IsPossibleDispositionEvent(const views::Event& event); +bool IsPossibleDispositionEvent(const ui::Event& event); } // namespace event_utils diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc index 6dd1482..a713dc2 100644 --- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc @@ -152,7 +152,7 @@ class BundleInstalledBubble : public views::BubbleDelegateView, // views::ButtonListener implementation: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { StartFade(false); } diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index 263772f..0c4deec 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -240,7 +240,7 @@ class InstalledBubbleContent : public views::View, AddChildView(close_button_); } - virtual void ButtonPressed(views::Button* sender, const views::Event& event) { + virtual void ButtonPressed(views::Button* sender, const ui::Event& event) { if (sender == close_button_) bubble_->StartFade(false); else diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc index 08f6f51..9a02a60 100644 --- a/chrome/browser/ui/views/extensions/shell_window_views.cc +++ b/chrome/browser/ui/views/extensions/shell_window_views.cc @@ -81,7 +81,7 @@ class ShellWindowFrameView : public views::NonClientFrameView, private: // views::ButtonListener implementation. - virtual void ButtonPressed(views::Button* sender, const views::Event& event) + virtual void ButtonPressed(views::Button* sender, const ui::Event& event) OVERRIDE; ShellWindowViews* window_; @@ -296,7 +296,7 @@ gfx::Size ShellWindowFrameView::GetMaximumSize() { } void ShellWindowFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { DCHECK(!window_->frameless()); if (sender == close_button_) frame_->Close(); diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index a8dd916..4f94d57 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -352,7 +352,7 @@ gfx::Size FindBarView::GetPreferredSize() { // FindBarView, views::ButtonListener implementation: void FindBarView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { switch (sender->tag()) { case FIND_PREVIOUS_TAG: case FIND_NEXT_TAG: diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index 6281612..c04fdbd 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h @@ -74,7 +74,7 @@ class FindBarView : public DropdownBarView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::TextfieldController: virtual void ContentsChanged(views::Textfield* sender, diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc index 21288e4..8e210e6 100644 --- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc +++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc @@ -118,7 +118,7 @@ class AppNonClientFrameViewAura::ControlView } virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { if (sender == close_button_) { owner_->Close(); } else if (sender == restore_button_) { diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index 2d901c0..ff46cf9 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -235,7 +235,7 @@ void AppPanelBrowserFrameView::Layout() { // AppPanelBrowserFrameView, views::ButtonListener implementation: void AppPanelBrowserFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == close_button_) frame()->Close(); } diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h index a574a53..3f2fed7 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.h @@ -52,7 +52,7 @@ class AppPanelBrowserFrameView : public BrowserNonClientFrameView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from chrome::TabIconViewModel: virtual bool ShouldTabIconViewAnimate() const OVERRIDE; diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index 5cf5196..27c1de7 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -341,7 +341,7 @@ void BrowserFrameWin::TabStripDisplayModeChanged() { } void BrowserFrameWin::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { HMODULE metro = base::win::GetMetroModule(); if (!metro) return; diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h index 1c23d43..9d4d4ee 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.h +++ b/chrome/browser/ui/views/frame/browser_frame_win.h @@ -71,7 +71,7 @@ class BrowserFrameWin : public views::NativeWidgetWin, // Overriden from views::ImageButton override: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from WindowImpl: virtual LRESULT OnWndProc(UINT message, diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 58b2d92..507562d 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -436,7 +436,7 @@ void OpaqueBrowserFrameView::GetAccessibleState( // OpaqueBrowserFrameView, views::ButtonListener implementation: void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == minimize_button_) frame()->Minimize(); else if (sender == maximize_button_) diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h index 7192529..1555d95 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h @@ -71,7 +71,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView, virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; // Overridden from views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, const views::Event& event) + virtual void ButtonPressed(views::Button* sender, const ui::Event& event) OVERRIDE; // Overridden from chrome::TabIconViewModel: diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 34c6ead..ae8c26f 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -88,7 +88,7 @@ class FullscreenExitBubbleViews::FullscreenExitView // views::ButtonListener virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; @@ -189,7 +189,7 @@ FullscreenExitBubbleViews::FullscreenExitView::~FullscreenExitView() { void FullscreenExitBubbleViews::FullscreenExitView::ButtonPressed( views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == button_view_->accept_button()) bubble_->Accept(); else diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index d1c761d..9316b41 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -152,7 +152,7 @@ gfx::Rect GlobalErrorBubbleView::GetAnchorRect() { } void GlobalErrorBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (error_) { if (sender->tag() == TAG_ACCEPT_BUTTON) error_->BubbleViewAcceptButtonPressed(browser_); diff --git a/chrome/browser/ui/views/global_error_bubble_view.h b/chrome/browser/ui/views/global_error_bubble_view.h index 242ceff..b5f3720 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.h +++ b/chrome/browser/ui/views/global_error_bubble_view.h @@ -28,7 +28,7 @@ class GlobalErrorBubbleView : public views::ButtonListener, // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::WidgetDelegate implementation. virtual void WindowClosing() OVERRIDE; diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index b23b9af..d1f21fb 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -324,7 +324,7 @@ views::View* HungRendererDialogView::GetContentsView() { // HungRendererDialogView, views::ButtonListener implementation: void HungRendererDialogView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { if (sender == kill_button_ && hung_pages_table_model_->GetRenderProcessHost()) { diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h index 0bc8b13..189265b 100644 --- a/chrome/browser/ui/views/hung_renderer_view.h +++ b/chrome/browser/ui/views/hung_renderer_view.h @@ -124,7 +124,7 @@ class HungRendererDialogView : public views::DialogDelegateView, // views::ButtonListener overrides: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // HungPagesTableModel::Delegate overrides: virtual void TabDestroyed() OVERRIDE; diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.cc b/chrome/browser/ui/views/infobars/after_translate_infobar.cc index 6243fae..6a01e91 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.cc @@ -125,7 +125,7 @@ void AfterTranslateInfoBar::ViewHierarchyChanged(bool is_add, } void AfterTranslateInfoBar::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (!owned()) return; // We're closing; don't call anything, it might access the owner. if (sender == revert_button_) diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.h b/chrome/browser/ui/views/infobars/after_translate_infobar.h index 7b32771..b5ce90b 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.h +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.h @@ -30,7 +30,7 @@ class AfterTranslateInfoBar : public TranslateInfoBarBase, views::View* parent, views::View* child) OVERRIDE; virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; virtual int ContentMinimumWidth() const OVERRIDE; virtual void OriginalLanguageChanged() OVERRIDE; virtual void TargetLanguageChanged() OVERRIDE; diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.cc b/chrome/browser/ui/views/infobars/before_translate_infobar.cc index a560f29..7dc44a2 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.cc @@ -160,7 +160,7 @@ int BeforeTranslateInfoBar::ContentMinimumWidth() const { } void BeforeTranslateInfoBar::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (!owned()) return; // We're closing; don't call anything, it might access the owner. TranslateInfoBarDelegate* delegate = GetDelegate(); diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.h b/chrome/browser/ui/views/infobars/before_translate_infobar.h index 3888ffc..41334b0 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.h +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.h @@ -27,7 +27,7 @@ class BeforeTranslateInfoBar : public TranslateInfoBarBase, // TranslateInfoBarBase: virtual void Layout() OVERRIDE; virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; virtual void ViewHierarchyChanged(bool is_add, views::View* parent, views::View* child) OVERRIDE; diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.cc b/chrome/browser/ui/views/infobars/confirm_infobar.cc index a182210..b3c20a4 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc @@ -97,7 +97,7 @@ void ConfirmInfoBar::ViewHierarchyChanged(bool is_add, } void ConfirmInfoBar::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (!owned()) return; // We're closing; don't call anything, it might access the owner. ConfirmInfoBarDelegate* delegate = GetDelegate(); diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.h b/chrome/browser/ui/views/infobars/confirm_infobar.h index 0d34182..35835470 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.h +++ b/chrome/browser/ui/views/infobars/confirm_infobar.h @@ -34,7 +34,7 @@ class ConfirmInfoBar : public InfoBarView, View* parent, View* child) OVERRIDE; virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; virtual int ContentMinimumWidth() const OVERRIDE; // views::LinkListener: diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index f04717c..42afa3e 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -259,7 +259,7 @@ void InfoBarView::PaintChildren(gfx::Canvas* canvas) { } void InfoBarView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (!owned()) return; // We're closing; don't call anything, it might access the owner. if (sender == close_button_) { diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h index 8a41187..13e72f7 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.h +++ b/chrome/browser/ui/views/infobars/infobar_view.h @@ -76,7 +76,7 @@ class InfoBarView : public InfoBar, // NOTE: This must not be called if we're unowned. (Subclasses should ignore // calls to ButtonPressed() in this case.) virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Returns the minimum width the content (that is, everything between the icon // and the close button) can be shrunk to. This is used to prevent the close diff --git a/chrome/browser/ui/views/infobars/media_stream_infobar.cc b/chrome/browser/ui/views/infobars/media_stream_infobar.cc index 1b61556..cd858f0 100644 --- a/chrome/browser/ui/views/infobars/media_stream_infobar.cc +++ b/chrome/browser/ui/views/infobars/media_stream_infobar.cc @@ -92,7 +92,7 @@ void MediaStreamInfoBar::ViewHierarchyChanged(bool is_add, } void MediaStreamInfoBar::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (!owned()) return; // We're closing; don't call anything, it might access the owner. if (sender == allow_button_) { diff --git a/chrome/browser/ui/views/infobars/media_stream_infobar.h b/chrome/browser/ui/views/infobars/media_stream_infobar.h index ea6e962..b0df0aa 100644 --- a/chrome/browser/ui/views/infobars/media_stream_infobar.h +++ b/chrome/browser/ui/views/infobars/media_stream_infobar.h @@ -36,7 +36,7 @@ class MediaStreamInfoBar : public InfoBarView, views::View* parent, views::View* child) OVERRIDE; virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; virtual int ContentMinimumWidth() const OVERRIDE; // views::MenuButtonListener: diff --git a/chrome/browser/ui/views/infobars/translate_message_infobar.cc b/chrome/browser/ui/views/infobars/translate_message_infobar.cc index 2f2c787..58987b9 100644 --- a/chrome/browser/ui/views/infobars/translate_message_infobar.cc +++ b/chrome/browser/ui/views/infobars/translate_message_infobar.cc @@ -56,7 +56,7 @@ void TranslateMessageInfoBar::ViewHierarchyChanged(bool is_add, } void TranslateMessageInfoBar::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (!owned()) return; // We're closing; don't call anything, it might access the owner. if (sender == button_) diff --git a/chrome/browser/ui/views/infobars/translate_message_infobar.h b/chrome/browser/ui/views/infobars/translate_message_infobar.h index 246be15..7b0d2cf 100644 --- a/chrome/browser/ui/views/infobars/translate_message_infobar.h +++ b/chrome/browser/ui/views/infobars/translate_message_infobar.h @@ -21,7 +21,7 @@ class TranslateMessageInfoBar : public TranslateInfoBarBase { View* parent, View* child) OVERRIDE; virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; virtual int ContentMinimumWidth() const OVERRIDE; views::Label* label_; diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc index bdba991e..ca545ad 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.cc @@ -121,7 +121,7 @@ void ZoomBubbleView::OnMouseExited(const views::MouseEvent& event) { } void ZoomBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { chrome_page_zoom::Zoom(tab_contents_->web_contents(), content::PAGE_ZOOM_RESET); } diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h index 7c9de2a..5fd09fd 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h @@ -51,7 +51,7 @@ class ZoomBubbleView : public views::BubbleDelegateView, // views::ButtonListener method. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::BubbleDelegateView method. virtual void Init() OVERRIDE; diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc index 54d0234..6f6587d 100644 --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc @@ -115,7 +115,7 @@ gfx::Rect NetworkProfileBubbleView::GetAnchorRect() { } void NetworkProfileBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { NetworkProfileBubble::RecordUmaEvent( NetworkProfileBubble::METRIC_ACKNOWLEDGED); diff --git a/chrome/browser/ui/views/network_profile_bubble_view.h b/chrome/browser/ui/views/network_profile_bubble_view.h index a7b2e86..4952f9f 100644 --- a/chrome/browser/ui/views/network_profile_bubble_view.h +++ b/chrome/browser/ui/views/network_profile_bubble_view.h @@ -33,7 +33,7 @@ class NetworkProfileBubbleView : public views::BubbleDelegateView, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener: virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/notifications/balloon_view_views.cc b/chrome/browser/ui/views/notifications/balloon_view_views.cc index 8e30e2d..18de85bf 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_views.cc +++ b/chrome/browser/ui/views/notifications/balloon_view_views.cc @@ -179,7 +179,7 @@ void BalloonViewImpl::OnWorkAreaChanged() { } void BalloonViewImpl::ButtonPressed(views::Button* sender, - const views::Event&) { + const ui::Event&) { // The only button currently is the close button. DCHECK(sender == close_button_); Close(true); diff --git a/chrome/browser/ui/views/notifications/balloon_view_views.h b/chrome/browser/ui/views/notifications/balloon_view_views.h index 4cea6a2..baaa4b3 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_views.h +++ b/chrome/browser/ui/views/notifications/balloon_view_views.h @@ -74,7 +74,7 @@ class BalloonViewImpl : public BalloonView, // views::ButtonListener interface. virtual void ButtonPressed(views::Button* sender, - const views::Event&) OVERRIDE; + const ui::Event&) OVERRIDE; // content::NotificationObserver interface. virtual void Observe(int type, diff --git a/chrome/browser/ui/views/password_generation_bubble_view.cc b/chrome/browser/ui/views/password_generation_bubble_view.cc index 1e82e3a..80873f8 100644 --- a/chrome/browser/ui/views/password_generation_bubble_view.cc +++ b/chrome/browser/ui/views/password_generation_bubble_view.cc @@ -97,7 +97,7 @@ gfx::Rect PasswordGenerationBubbleView::GetAnchorRect() { } void PasswordGenerationBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == accept_button_) { render_view_host_->Send(new AutofillMsg_GeneratedPasswordAccepted( render_view_host_->GetRoutingID(), text_field_->text())); diff --git a/chrome/browser/ui/views/password_generation_bubble_view.h b/chrome/browser/ui/views/password_generation_bubble_view.h index 53fed75..6010d0f 100644 --- a/chrome/browser/ui/views/password_generation_bubble_view.h +++ b/chrome/browser/ui/views/password_generation_bubble_view.h @@ -53,7 +53,7 @@ class PasswordGenerationBubbleView : public views::BubbleDelegateView, // views::ButtonListener virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc index 307701c..8a0d9cc 100644 --- a/chrome/browser/ui/views/reload_button.cc +++ b/chrome/browser/ui/views/reload_button.cc @@ -112,7 +112,7 @@ void ReloadButton::LoadImages(ui::ThemeProvider* tp) { // ReloadButton, views::ButtonListener implementation: void ReloadButton::ButtonPressed(views::Button* /* button */, - const views::Event& event) { + const ui::Event& event) { ClearPendingMenu(); if (visible_mode_ == MODE_STOP) { diff --git a/chrome/browser/ui/views/reload_button.h b/chrome/browser/ui/views/reload_button.h index 0fe4b3b..31af25c 100644 --- a/chrome/browser/ui/views/reload_button.h +++ b/chrome/browser/ui/views/reload_button.h @@ -49,7 +49,7 @@ class ReloadButton : public views::ButtonDropDown, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* /* button */, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::View: virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 5c61ac5..71d7e9e 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -130,7 +130,7 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) { } void SadTabView::ButtonPressed(views::Button* source, - const views::Event& event) { + const ui::Event& event) { DCHECK(web_contents_); DCHECK(source == reload_button_); web_contents_->GetController().Reload(true); diff --git a/chrome/browser/ui/views/sad_tab_view.h b/chrome/browser/ui/views/sad_tab_view.h index d7b06c1..0c9ae90 100644 --- a/chrome/browser/ui/views/sad_tab_view.h +++ b/chrome/browser/ui/views/sad_tab_view.h @@ -48,7 +48,7 @@ class SadTabView : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* source, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; protected: // Overridden from views::View: diff --git a/chrome/browser/ui/views/speech_recognition_bubble_views.cc b/chrome/browser/ui/views/speech_recognition_bubble_views.cc index 957b71ae..7171460 100644 --- a/chrome/browser/ui/views/speech_recognition_bubble_views.cc +++ b/chrome/browser/ui/views/speech_recognition_bubble_views.cc @@ -62,7 +62,7 @@ class SpeechRecognitionBubbleView // views::ButtonListener methods. virtual void ButtonPressed(views::Button* source, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener methods. virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; @@ -215,7 +215,7 @@ void SpeechRecognitionBubbleView::SetImage(const gfx::ImageSkia& image) { } void SpeechRecognitionBubbleView::ButtonPressed(views::Button* source, - const views::Event& event) { + const ui::Event& event) { if (source == cancel_) { delegate_->InfoBubbleButtonClicked(SpeechRecognitionBubble::BUTTON_CANCEL); } else if (source == try_again_) { diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index c926647..dabcbda 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc @@ -224,7 +224,7 @@ views::View* SSLClientCertificateSelector::GetExtraView() { // views::ButtonListener implementation: void SSLClientCertificateSelector::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { if (sender == view_cert_button_) { net::X509Certificate* cert = GetSelectedCert(); if (cert) diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h index ab3644e..26dd2b3 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.h +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h @@ -67,7 +67,7 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::TableViewObserver: virtual void OnSelectionChanged() OVERRIDE; diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc index 81da8db..fda05de 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc @@ -184,7 +184,7 @@ void OneClickSigninBubbleView::LinkClicked(views::Link* source, } void OneClickSigninBubbleView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { StartFade(false); if (ok_button_ == sender) { base::ResetAndReturn(&start_sync_callback_).Run( diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h index 458ac2b..1d5b660 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h +++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.h @@ -71,7 +71,7 @@ class OneClickSigninBubbleView : public views::BubbleDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // The bubble, if we're showing one. static OneClickSigninBubbleView* bubble_view_; diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index f1a8c8a..5978dd3 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -570,7 +570,7 @@ void BaseTab::AnimationEnded(const ui::Animation* animation) { SchedulePaint(); } -void BaseTab::ButtonPressed(views::Button* sender, const views::Event& event) { +void BaseTab::ButtonPressed(views::Button* sender, const ui::Event& event) { DCHECK(sender == close_button_); controller()->CloseTab(this); } diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h index 6240907..a263762 100644 --- a/chrome/browser/ui/views/tabs/base_tab.h +++ b/chrome/browser/ui/views/tabs/base_tab.h @@ -127,7 +127,7 @@ class BaseTab : public ui::AnimationDelegate, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::ContextMenuController: virtual void ShowContextMenuForView(views::View* source, diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 6d767d5..ce484b5 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -737,7 +737,7 @@ void TabStrip::PrepareForCloseAt(int model_index) { // If the user closes the tab from a touch device don't wait for the mouse to // move out of the tab strip (it may never happen). // TODO: maybe we should use a delay on touch devices. - const views::Event* event = GetWidget()->GetCurrentEvent(); + const ui::Event* event = GetWidget()->GetCurrentEvent(); if (event && event->type() == ui::ET_MOUSE_RELEASED && event->flags() & ui::EF_FROM_TOUCH) return; @@ -1353,7 +1353,7 @@ int TabStrip::GetMiniTabCount() const { /////////////////////////////////////////////////////////////////////////////// // TabStrip, views::ButtonListener implementation: -void TabStrip::ButtonPressed(views::Button* sender, const views::Event& event) { +void TabStrip::ButtonPressed(views::Button* sender, const ui::Event& event) { if (sender == newtab_button_) { content::RecordAction(UserMetricsAction("NewTab_Button")); UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_BUTTON, diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h index 9f3c5be..d8d98fc 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.h +++ b/chrome/browser/ui/views/tabs/tab_strip.h @@ -219,7 +219,7 @@ class TabStrip : public views::View, // views::ButtonListener implementation: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // View overrides. virtual const views::View* GetViewByID(int id) const OVERRIDE; diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index f3ee434..164fa85 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -289,7 +289,7 @@ class TaskManagerView : public views::ButtonListener, // views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::DialogDelegateView: virtual bool CanResize() const OVERRIDE; @@ -605,7 +605,7 @@ void TaskManagerView::Show(bool highlight_background_resources) { // ButtonListener implementation. void TaskManagerView::ButtonPressed( - views::Button* sender, const views::Event& event) { + views::Button* sender, const ui::Event& event) { if (purge_memory_button_ && (sender == purge_memory_button_)) { MemoryPurger::PurgeAll(); } else { diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 81ecae7..2351330 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -527,7 +527,7 @@ void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) { // ToolbarView, views::Button::ButtonListener implementation: void ToolbarView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { int command = sender->tag(); WindowOpenDisposition disposition = chrome::DispositionFromEventFlags(sender->mouse_event_flags()); diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index d02a47a..b244513 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -132,7 +132,7 @@ class ToolbarView : public views::AccessiblePaneView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from content::NotificationObserver: virtual void Observe(int type, diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index c8dbeea..28a798e 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -136,7 +136,7 @@ string16 UninstallView::GetDialogButtonLabel(ui::DialogButton button) const { } void UninstallView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (change_default_browser_ == sender) { // Disable the browsers combobox if the user unchecks the checkbox. DCHECK(browsers_combo_); diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index 173df47..0235a27 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h @@ -31,7 +31,7 @@ class UninstallView : public views::ButtonListener, // Overridden form views::ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::DialogDelegateView: virtual bool Accept() OVERRIDE; diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc index 935f7fc..bf6f662 100644 --- a/chrome/browser/ui/views/web_intent_picker_views.cc +++ b/chrome/browser/ui/views/web_intent_picker_views.cc @@ -267,7 +267,7 @@ class ServiceButtonsView : public views::View, // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; virtual gfx::Size GetPreferredSize() OVERRIDE; @@ -343,7 +343,7 @@ void ServiceButtonsView::StartThrobber(const GURL& url) { } void ServiceButtonsView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { size_t index = static_cast<size_t>(sender->tag()); delegate_->OnServiceButtonClicked(model_->GetInstalledServiceAt(index)); } @@ -453,7 +453,7 @@ class SuggestedExtensionsRowView : public views::View, // ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // LinkListener implementation. void LinkClicked(views::Link* source, int event_flags) OVERRIDE; @@ -523,7 +523,7 @@ SuggestedExtensionsRowView::~SuggestedExtensionsRowView() { } void SuggestedExtensionsRowView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { delegate_->OnExtensionInstallClicked(extension_->id); } @@ -666,7 +666,7 @@ class WebIntentPickerViews : public views::ButtonListener, // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::DialogDelegate implementation. virtual void WindowClosing() OVERRIDE; @@ -817,7 +817,7 @@ WebIntentPickerViews::~WebIntentPickerViews() { } void WebIntentPickerViews::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { delegate_->OnPickerClosed(); } diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index 6aa1c47..6cfd840 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -366,7 +366,7 @@ void WebsiteSettingsPopupView::OnWidgetClosing(views::Widget* widget) { void WebsiteSettingsPopupView::ButtonPressed( views::Button* button, - const views::Event& event) { + const ui::Event& event) { GetWidget()->Close(); } diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h index ff9b206..97f3d74 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h @@ -66,7 +66,7 @@ class WebsiteSettingsPopupView // views::ButtonListener implementation. virtual void ButtonPressed(views::Button* button, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // views::LinkListener implementation. virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE; diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index a8c0c24..558d7e0 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -486,7 +486,7 @@ class WrenchMenu::CutCopyPasteView : public WrenchMenuView { // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { menu_->CancelAndEvaluate(menu_model_, sender->tag()); } @@ -646,7 +646,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView, // Overridden from ButtonListener. virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE { + const ui::Event& event) OVERRIDE { if (sender->tag() == fullscreen_index_) { menu_->CancelAndEvaluate(menu_model_, sender->tag()); } else { @@ -803,7 +803,7 @@ string16 WrenchMenu::GetTooltipText(int id, } bool WrenchMenu::IsTriggerableEvent(views::MenuItemView* menu, - const views::Event& e) { + const ui::Event& e) { return is_bookmark_command(menu->GetCommand()) ? bookmark_menu_delegate_->IsTriggerableEvent(menu, e) : MenuDelegate::IsTriggerableEvent(menu, e); diff --git a/chrome/browser/ui/views/wrench_menu.h b/chrome/browser/ui/views/wrench_menu.h index 8db5c41..7117aec 100644 --- a/chrome/browser/ui/views/wrench_menu.h +++ b/chrome/browser/ui/views/wrench_menu.h @@ -41,7 +41,7 @@ class WrenchMenu : public views::MenuDelegate, // MenuDelegate overrides: virtual string16 GetTooltipText(int id, const gfx::Point& p) const OVERRIDE; virtual bool IsTriggerableEvent(views::MenuItemView* menu, - const views::Event& e) OVERRIDE; + const ui::Event& e) OVERRIDE; virtual bool GetDropFormats( views::MenuItemView* menu, int* formats, diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index 5dbbd3a..9398dce 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -266,8 +266,7 @@ class ShellWindowDelegateView : public WidgetDelegateView, } // Overriden from ButtonListener - virtual void ButtonPressed(Button* sender, - const Event& event) OVERRIDE { + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { if (sender == back_button_) shell_->GoBackOrForward(-1); else if (sender == forward_button_) diff --git a/ui/app_list/app_list_view.cc b/ui/app_list/app_list_view.cc index f89c9e6..1a9dd3d 100644 --- a/ui/app_list/app_list_view.cc +++ b/ui/app_list/app_list_view.cc @@ -140,8 +140,7 @@ bool AppListView::OnKeyPressed(const ui::KeyEvent& event) { return false; } -void AppListView::ButtonPressed(views::Button* sender, - const views::Event& event) { +void AppListView::ButtonPressed(views::Button* sender, const ui::Event& event) { if (sender->GetClassName() != AppListItemView::kViewClassName) return; diff --git a/ui/app_list/app_list_view.h b/ui/app_list/app_list_view.h index 3225a13..5bdebe6 100644 --- a/ui/app_list/app_list_view.h +++ b/ui/app_list/app_list_view.h @@ -59,7 +59,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from views::BubbleDelegate: virtual gfx::Rect GetBubbleBounds() OVERRIDE; diff --git a/ui/app_list/page_switcher.cc b/ui/app_list/page_switcher.cc index c0b4d6f..500324f 100644 --- a/ui/app_list/page_switcher.cc +++ b/ui/app_list/page_switcher.cc @@ -175,7 +175,7 @@ void PageSwitcher::CalculateButtonWidth(int contents_width) { } void PageSwitcher::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { for (int i = 0; i < buttons_->child_count(); ++i) { if (sender == static_cast<views::Button*>(buttons_->child_at(i))) { model_->SelectPage(i, true /* animate */); diff --git a/ui/app_list/page_switcher.h b/ui/app_list/page_switcher.h index 9e338a8..d6fc786 100644 --- a/ui/app_list/page_switcher.h +++ b/ui/app_list/page_switcher.h @@ -33,7 +33,7 @@ class PageSwitcher : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from PaginationModelObserver: virtual void TotalPagesChanged() OVERRIDE; diff --git a/ui/app_list/search_result_list_view.cc b/ui/app_list/search_result_list_view.cc index 9e77cc5..d03b143 100644 --- a/ui/app_list/search_result_list_view.cc +++ b/ui/app_list/search_result_list_view.cc @@ -133,7 +133,7 @@ void SearchResultListView::ScheduleUpdate() { } void SearchResultListView::ButtonPressed(views::Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender->GetClassName() != SearchResultView::kViewClassName) return; diff --git a/ui/app_list/search_result_list_view.h b/ui/app_list/search_result_list_view.h index c362c1a..90311d5 100644 --- a/ui/app_list/search_result_list_view.h +++ b/ui/app_list/search_result_list_view.h @@ -48,7 +48,7 @@ class SearchResultListView : public views::View, // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // Overridden from ListModelObserver: virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE; diff --git a/ui/base/event.cc b/ui/base/event.cc index fc08cf7..a19faf5 100644 --- a/ui/base/event.cc +++ b/ui/base/event.cc @@ -72,6 +72,7 @@ Event::Event(const base::NativeEvent& native_event, Event::Event(const Event& copy) : native_event_(copy.native_event_), + ui_native_event_(copy.ui_native_event_), type_(copy.type_), time_stamp_(copy.time_stamp_), flags_(copy.flags_), @@ -80,10 +81,12 @@ Event::Event(const Event& copy) void Event::Init() { std::memset(&native_event_, 0, sizeof(native_event_)); + std::memset(&ui_native_event_, 0, sizeof(ui_native_event_)); } void Event::InitWithNativeEvent(const base::NativeEvent& native_event) { native_event_ = native_event; + std::memset(&ui_native_event_, 0, sizeof(ui_native_event_)); } LocatedEvent::~LocatedEvent() { diff --git a/ui/base/event.h b/ui/base/event.h index af04817..147a06e 100644 --- a/ui/base/event.h +++ b/ui/base/event.h @@ -20,6 +20,12 @@ namespace ui { class Transform; +#if defined(USE_AURA) +typedef Event* NativeEvent; +#else +typedef base::NativeEvent NativeEvent; +#endif + class UI_EXPORT Event { public: virtual ~Event(); @@ -39,6 +45,7 @@ class UI_EXPORT Event { }; const base::NativeEvent& native_event() const { return native_event_; } + const ui::NativeEvent& ui_native_event() const { return ui_native_event_; } EventType type() const { return type_; } // time_stamp represents time since machine was booted. const base::TimeDelta& time_stamp() const { return time_stamp_; } @@ -55,6 +62,35 @@ class UI_EXPORT Event { bool IsCapsLockDown() const { return (flags_ & EF_CAPS_LOCK_DOWN) != 0; } bool IsAltDown() const { return (flags_ & EF_ALT_DOWN) != 0; } + bool IsMouseEvent() const { + return type_ == ui::ET_MOUSE_PRESSED || + type_ == ui::ET_MOUSE_DRAGGED || + type_ == ui::ET_MOUSE_RELEASED || + type_ == ui::ET_MOUSE_MOVED || + type_ == ui::ET_MOUSE_ENTERED || + type_ == ui::ET_MOUSE_EXITED || + type_ == ui::ET_MOUSEWHEEL; + } + + bool IsTouchEvent() const { + return type_ == ui::ET_TOUCH_RELEASED || + type_ == ui::ET_TOUCH_PRESSED || + type_ == ui::ET_TOUCH_MOVED || + type_ == ui::ET_TOUCH_STATIONARY || + type_ == ui::ET_TOUCH_CANCELLED; + } + + bool IsScrollGestureEvent() const { + return type_ == ui::ET_GESTURE_SCROLL_BEGIN || + type_ == ui::ET_GESTURE_SCROLL_UPDATE || + type_ == ui::ET_GESTURE_SCROLL_END; + } + + bool IsFlingScrollEvent() const { + return type_ == ui::ET_SCROLL_FLING_CANCEL || + type_ == ui::ET_SCROLL_FLING_START; + } + // Returns true if the event has a valid |native_event_|. bool HasNativeEvent() const; @@ -76,6 +112,8 @@ class UI_EXPORT Event { void InitWithNativeEvent(const base::NativeEvent& native_event); base::NativeEvent native_event_; + // TODO(beng): check to see if this is necessary. + ui::NativeEvent ui_native_event_; EventType type_; base::TimeDelta time_stamp_; int flags_; diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index d9b6702..bb36d92 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.cc @@ -758,6 +758,10 @@ int EventFlagsFromNative(const base::NativeEvent& native_event) { } base::TimeDelta EventTimeFromNative(const base::NativeEvent& native_event) { + // Synthetic events don't have native events. + if (!native_event) + return base::TimeDelta(); + switch(native_event->type) { case KeyPress: case KeyRelease: diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc index f7551d6..4c5dec4 100644 --- a/ui/views/accessible_pane_view_unittest.cc +++ b/ui/views/accessible_pane_view_unittest.cc @@ -24,7 +24,7 @@ class TestBarView : public AccessiblePaneView, virtual ~TestBarView(); virtual void ButtonPressed(Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; TextButton* child_button() const { return child_button_.get(); } TextButton* second_child_button() const { return second_child_button_.get(); } TextButton* third_child_button() const { return third_child_button_.get(); } @@ -55,8 +55,8 @@ TestBarView::TestBarView() { TestBarView::~TestBarView() {} -void TestBarView::ButtonPressed(views::Button* sender, - const views::Event& event) {} +void TestBarView::ButtonPressed(views::Button* sender, const ui::Event& event) { +} void TestBarView::Init() { SetLayoutManager(new views::FillLayout()); diff --git a/ui/views/controls/button/button.cc b/ui/views/controls/button/button.cc index 2c7368d..0de1e57 100644 --- a/ui/views/controls/button/button.cc +++ b/ui/views/controls/button/button.cc @@ -55,7 +55,7 @@ Button::Button(ButtonListener* listener) set_accessibility_focusable(true); } -void Button::NotifyClick(const views::Event& event) { +void Button::NotifyClick(const ui::Event& event) { mouse_event_flags_ = event.IsMouseEvent() ? event.flags() : 0; // We can be called when there is no listener, in cases like double clicks on // menu buttons etc. diff --git a/ui/views/controls/button/button.h b/ui/views/controls/button/button.h index 9b01caf..da50d6e 100644 --- a/ui/views/controls/button/button.h +++ b/ui/views/controls/button/button.h @@ -16,7 +16,7 @@ class Event; // pressed. class VIEWS_EXPORT ButtonListener { public: - virtual void ButtonPressed(Button* sender, const views::Event& event) = 0; + virtual void ButtonPressed(Button* sender, const ui::Event& event) = 0; protected: virtual ~ButtonListener() {} @@ -50,7 +50,7 @@ class VIEWS_EXPORT Button : public View { explicit Button(ButtonListener* listener); // Cause the button to notify the listener that a click occurred. - virtual void NotifyClick(const views::Event& event); + virtual void NotifyClick(const ui::Event& event); // The button's listener. Notified when clicked. ButtonListener* listener_; diff --git a/ui/views/controls/button/button_dropdown.cc b/ui/views/controls/button/button_dropdown.cc index e4c665d..9824731 100644 --- a/ui/views/controls/button/button_dropdown.cc +++ b/ui/views/controls/button/button_dropdown.cc @@ -133,7 +133,7 @@ void ButtonDropDown::GetAccessibleState(ui::AccessibleViewState* state) { state->state = ui::AccessibilityTypes::STATE_HASPOPUP; } -bool ButtonDropDown::ShouldEnterPushedState(const Event& event) { +bool ButtonDropDown::ShouldEnterPushedState(const ui::Event& event) { // Enter PUSHED state on press with Left or Right mouse button or on taps. // Remain in this state while the context menu is open. return event.type() == ui::ET_GESTURE_TAP || diff --git a/ui/views/controls/button/button_dropdown.h b/ui/views/controls/button/button_dropdown.h index 8e57222..07103b4 100644 --- a/ui/views/controls/button/button_dropdown.h +++ b/ui/views/controls/button/button_dropdown.h @@ -58,7 +58,7 @@ class VIEWS_EXPORT ButtonDropDown : public ImageButton { // pressed when a user holds the mouse down over the button. For this // implementation, both left and right mouse buttons can trigger a change // to the PUSHED state. - virtual bool ShouldEnterPushedState(const Event& event) OVERRIDE; + virtual bool ShouldEnterPushedState(const ui::Event& event) OVERRIDE; // Returns if menu should be shown. Override this to change default behavior. virtual bool ShouldShowMenu(); diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc index cfedcce..0f3387e 100644 --- a/ui/views/controls/button/checkbox.cc +++ b/ui/views/controls/button/checkbox.cc @@ -69,7 +69,7 @@ void Checkbox::OnPaintFocusBorder(gfx::Canvas* canvas) { } } -void Checkbox::NotifyClick(const views::Event& event) { +void Checkbox::NotifyClick(const ui::Event& event) { SetChecked(!checked()); RequestFocus(); TextButtonBase::NotifyClick(event); diff --git a/ui/views/controls/button/checkbox.h b/ui/views/controls/button/checkbox.h index 35cdc25..e463d03 100644 --- a/ui/views/controls/button/checkbox.h +++ b/ui/views/controls/button/checkbox.h @@ -39,7 +39,7 @@ class VIEWS_EXPORT Checkbox : public TextButtonBase { private: // Overridden from Button: - virtual void NotifyClick(const views::Event& event) OVERRIDE; + virtual void NotifyClick(const ui::Event& event) OVERRIDE; // Overridden from TextButtonBase: virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc index 183dbcd..d4fc386 100644 --- a/ui/views/controls/button/custom_button.cc +++ b/ui/views/controls/button/custom_button.cc @@ -295,14 +295,14 @@ CustomButton::CustomButton(ButtonListener* listener) void CustomButton::StateChanged() { } -bool CustomButton::IsTriggerableEvent(const Event& event) { +bool CustomButton::IsTriggerableEvent(const ui::Event& event) { return event.type() == ui::ET_GESTURE_TAP_DOWN || event.type() == ui::ET_GESTURE_TAP || (event.IsMouseEvent() && (triggerable_event_flags_ & event.flags()) != 0); } -bool CustomButton::ShouldEnterPushedState(const Event& event) { +bool CustomButton::ShouldEnterPushedState(const ui::Event& event) { return IsTriggerableEvent(event); } diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h index 9491811..5e07146 100644 --- a/ui/views/controls/button/custom_button.h +++ b/ui/views/controls/button/custom_button.h @@ -109,12 +109,12 @@ class VIEWS_EXPORT CustomButton : public Button, // Returns true if the event is one that can trigger notifying the listener. // This implementation returns true if the left mouse button is down. - virtual bool IsTriggerableEvent(const Event& event); + virtual bool IsTriggerableEvent(const ui::Event& event); // Returns true if the button should become pressed when the user // holds the mouse down over the button. For this implementation, // we simply return IsTriggerableEvent(event). - virtual bool ShouldEnterPushedState(const Event& event); + virtual bool ShouldEnterPushedState(const ui::Event& event); // Overridden from View: virtual void ViewHierarchyChanged(bool is_add, diff --git a/ui/views/controls/button/radio_button.cc b/ui/views/controls/button/radio_button.cc index 5218bcf..722672b 100644 --- a/ui/views/controls/button/radio_button.cc +++ b/ui/views/controls/button/radio_button.cc @@ -88,7 +88,7 @@ void RadioButton::OnFocus() { TextButtonBase::NotifyClick(event); } -void RadioButton::NotifyClick(const views::Event& event) { +void RadioButton::NotifyClick(const ui::Event& event) { // Set the checked state to true only if we are unchecked, since we can't // be toggled on and off like a checkbox. if (!checked()) diff --git a/ui/views/controls/button/radio_button.h b/ui/views/controls/button/radio_button.h index 9c23562..1101b2d 100644 --- a/ui/views/controls/button/radio_button.h +++ b/ui/views/controls/button/radio_button.h @@ -28,7 +28,7 @@ class VIEWS_EXPORT RadioButton : public Checkbox { virtual void OnFocus() OVERRIDE; // Overridden from Button: - virtual void NotifyClick(const views::Event& event) OVERRIDE; + virtual void NotifyClick(const ui::Event& event) OVERRIDE; // Overridden from TextButtonBase: virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; diff --git a/ui/views/controls/menu/menu_delegate.cc b/ui/views/controls/menu/menu_delegate.cc index f63e143..e45b37c 100644 --- a/ui/views/controls/menu/menu_delegate.cc +++ b/ui/views/controls/menu/menu_delegate.cc @@ -58,7 +58,7 @@ void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) { } bool MenuDelegate::IsTriggerableEvent(MenuItemView* source, - const Event& e) { + const ui::Event& e) { return e.type() == ui::ET_GESTURE_TAP || e.type() == ui::ET_GESTURE_TAP_DOWN || (e.IsMouseEvent() && (e.flags() & diff --git a/ui/views/controls/menu/menu_delegate.h b/ui/views/controls/menu/menu_delegate.h index c2c64f6..0d0dcf9 100644 --- a/ui/views/controls/menu/menu_delegate.h +++ b/ui/views/controls/menu/menu_delegate.h @@ -115,7 +115,7 @@ class VIEWS_EXPORT MenuDelegate { // Returns true if the specified event is one the user can use to trigger, or // accept, the item. Defaults to left or right mouse buttons or tap. - virtual bool IsTriggerableEvent(MenuItemView* view, const Event& e); + virtual bool IsTriggerableEvent(MenuItemView* view, const ui::Event& e); // Invoked to determine if drops can be accepted for a submenu. This is // ONLY invoked for menus that have submenus and indicates whether or not diff --git a/ui/views/controls/menu/menu_model_adapter.cc b/ui/views/controls/menu/menu_model_adapter.cc index 97b3266..e95615c 100644 --- a/ui/views/controls/menu/menu_model_adapter.cc +++ b/ui/views/controls/menu/menu_model_adapter.cc @@ -75,7 +75,7 @@ void MenuModelAdapter::ExecuteCommand(int id, int mouse_event_flags) { } bool MenuModelAdapter::IsTriggerableEvent(MenuItemView* source, - const Event& e) { + const ui::Event& e) { return e.type() == ui::ET_GESTURE_TAP || e.type() == ui::ET_GESTURE_TAP_DOWN || (e.IsMouseEvent() && (triggerable_event_flags_ & e.flags()) != 0); diff --git a/ui/views/controls/menu/menu_model_adapter.h b/ui/views/controls/menu/menu_model_adapter.h index 46fbb9c..1f837ff 100644 --- a/ui/views/controls/menu/menu_model_adapter.h +++ b/ui/views/controls/menu/menu_model_adapter.h @@ -43,7 +43,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate { virtual void ExecuteCommand(int id) OVERRIDE; virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; virtual bool IsTriggerableEvent(MenuItemView* source, - const Event& e) OVERRIDE; + const ui::Event& e) OVERRIDE; virtual bool GetAccelerator(int id, ui::Accelerator* accelerator) OVERRIDE; virtual string16 GetLabel(int id) const OVERRIDE; diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc index fbd2835..2787222 100644 --- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -299,7 +299,7 @@ void BitmapScrollBar::OnPaint(gfx::Canvas* canvas) { /////////////////////////////////////////////////////////////////////////////// // BitmapScrollBar, ButtonListener implementation: -void BitmapScrollBar::ButtonPressed(Button* sender, const views::Event& event) { +void BitmapScrollBar::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == prev_button_) { ScrollByAmount(SCROLL_PREV_LINE); } else if (sender == next_button_) { diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.h b/ui/views/controls/scrollbar/bitmap_scroll_bar.h index 4d1f6b8..dbecf66 100644 --- a/ui/views/controls/scrollbar/bitmap_scroll_bar.h +++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.h @@ -69,7 +69,7 @@ class VIEWS_EXPORT BitmapScrollBar : public BaseScrollBar, // BaseButton::ButtonListener overrides: virtual void ButtonPressed(Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; private: // Up/Down/Left/Right buttons. diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/ui/views/controls/scrollbar/native_scroll_bar_views.cc index 72f47c3..b7a67e0 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.cc +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.cc @@ -328,7 +328,7 @@ int NativeScrollBarViews::GetScrollIncrement(bool is_page, bool is_positive) { // BaseButton::ButtonListener overrides: void NativeScrollBarViews::ButtonPressed(Button* sender, - const views::Event& event) { + const ui::Event& event) { if (sender == prev_button_) { ScrollByAmount(SCROLL_PREV_LINE); } else if (sender == next_button_) { diff --git a/ui/views/controls/scrollbar/native_scroll_bar_views.h b/ui/views/controls/scrollbar/native_scroll_bar_views.h index 93dc963..99cf399 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_views.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_views.h @@ -48,7 +48,7 @@ class VIEWS_EXPORT NativeScrollBarViews : public BaseScrollBar, // BaseButton::ButtonListener overrides: virtual void ButtonPressed(Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; // NativeScrollBarWrapper overrides: virtual int GetPosition() const OVERRIDE; diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index b4b3e2c..429d5f6 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -75,8 +75,6 @@ NativeTextfieldViews::NativeTextfieldViews(Textfield* parent) initiating_drag_(false), ALLOW_THIS_IN_INITIALIZER_LIST(cursor_timer_(this)), aggregated_clicks_(0), - last_click_time_(), - last_click_location_(), ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_( TouchSelectionController::create(this))) { set_border(text_border_); diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h index b88a99d..ba94241 100644 --- a/ui/views/controls/textfield/native_textfield_views.h +++ b/ui/views/controls/textfield/native_textfield_views.h @@ -272,7 +272,7 @@ class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView, // State variables used to track double and triple clicks. size_t aggregated_clicks_; - base::Time last_click_time_; + base::TimeDelta last_click_time_; gfx::Point last_click_location_; // Context menu and its content list for the textfield. diff --git a/ui/views/events/event.cc b/ui/views/events/event.cc index dd04871..d42ff6c 100644 --- a/ui/views/events/event.cc +++ b/ui/views/events/event.cc @@ -12,28 +12,10 @@ namespace views { //////////////////////////////////////////////////////////////////////////////// -// Event, protected: - -Event::Event(ui::EventType type, int flags) - : type_(type), - time_stamp_(base::Time::NowFromSystemTime()), - flags_(flags) { - // Safely initialize the pointer/struct to null/empty. - memset(&native_event_, 0, sizeof(native_event_)); -} - -Event::Event(const NativeEvent& native_event, ui::EventType type, int flags) - : native_event_(native_event), - type_(type), - time_stamp_(base::Time::NowFromSystemTime()), - flags_(flags) { -} - -//////////////////////////////////////////////////////////////////////////////// // LocatedEvent, protected: #if !defined(USE_AURA) -LocatedEvent::LocatedEvent(const NativeEvent& native_event) +LocatedEvent::LocatedEvent(const ui::NativeEvent& native_event) : Event(native_event, ui::EventTypeFromNative(native_event), ui::EventFlagsFromNative(native_event)), @@ -67,7 +49,7 @@ LocatedEvent::LocatedEvent(const LocatedEvent& model, View* root) //////////////////////////////////////////////////////////////////////////////// // MouseEvent, public: -MouseEvent::MouseEvent(const NativeEvent& native_event) +MouseEvent::MouseEvent(const ui::NativeEvent& native_event) : LocatedEvent(native_event) { } @@ -79,14 +61,14 @@ MouseEvent::MouseEvent(const MouseEvent& model, View* source, View* target) // MouseWheelEvent, public: #if !defined(USE_AURA) -MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event) +MouseWheelEvent::MouseWheelEvent(const ui::NativeEvent& native_event) : MouseEvent(native_event), offset_(ui::GetMouseWheelOffset(native_event)) { } #endif MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event) - : MouseEvent(scroll_event.native_event()), + : MouseEvent(scroll_event), offset_(scroll_event.y_offset()) { set_type(ui::ET_MOUSEWHEEL); } diff --git a/ui/views/events/event.h b/ui/views/events/event.h index fa910cd..c1cf776 100644 --- a/ui/views/events/event.h +++ b/ui/views/events/event.h @@ -10,6 +10,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/time.h" +#include "ui/base/event.h" #include "ui/base/events.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -24,12 +25,6 @@ class OSExchangeData; namespace views { -#if defined(USE_AURA) -typedef ui::Event* NativeEvent; -#else -typedef base::NativeEvent NativeEvent; -#endif - class View; namespace internal { @@ -38,101 +33,20 @@ class RootView; //////////////////////////////////////////////////////////////////////////////// // -// Event class -// -// An event encapsulates an input event that can be propagated into view -// hierarchies. An event has a type, some flags and a time stamp. -// -// Each major event type has a corresponding Event subclass. -// -// Events are immutable but support copy -// -//////////////////////////////////////////////////////////////////////////////// -class VIEWS_EXPORT Event { - public: - const NativeEvent& native_event() const { return native_event_; } - ui::EventType type() const { return type_; } - const base::Time& time_stamp() const { return time_stamp_; } - - // Required for Gesture testing purposes. - void set_time_stamp(base::Time time_stamp) { time_stamp_ = time_stamp; } - - int flags() const { return flags_; } - void set_flags(int flags) { flags_ = flags; } - - // The following methods return true if the respective keys were pressed at - // the time the event was created. - bool IsShiftDown() const { return (flags_ & ui::EF_SHIFT_DOWN) != 0; } - bool IsControlDown() const { return (flags_ & ui::EF_CONTROL_DOWN) != 0; } - bool IsCapsLockDown() const { return (flags_ & ui::EF_CAPS_LOCK_DOWN) != 0; } - bool IsAltDown() const { return (flags_ & ui::EF_ALT_DOWN) != 0; } - - bool IsMouseEvent() const { - return type_ == ui::ET_MOUSE_PRESSED || - type_ == ui::ET_MOUSE_DRAGGED || - type_ == ui::ET_MOUSE_RELEASED || - type_ == ui::ET_MOUSE_MOVED || - type_ == ui::ET_MOUSE_ENTERED || - type_ == ui::ET_MOUSE_EXITED || - type_ == ui::ET_MOUSEWHEEL; - } - - bool IsTouchEvent() const { - return type_ == ui::ET_TOUCH_RELEASED || - type_ == ui::ET_TOUCH_PRESSED || - type_ == ui::ET_TOUCH_MOVED || - type_ == ui::ET_TOUCH_STATIONARY || - type_ == ui::ET_TOUCH_CANCELLED; - } - - bool IsScrollGestureEvent() const { - return type_ == ui::ET_GESTURE_SCROLL_BEGIN || - type_ == ui::ET_GESTURE_SCROLL_UPDATE || - type_ == ui::ET_GESTURE_SCROLL_END; - } - - bool IsFlingScrollEvent() const { - return type_ == ui::ET_SCROLL_FLING_CANCEL || - type_ == ui::ET_SCROLL_FLING_START; - } - - protected: - Event(ui::EventType type, int flags); - Event(const NativeEvent& native_event, ui::EventType type, int flags); - Event(const Event& model) - : native_event_(model.native_event()), - type_(model.type()), - time_stamp_(model.time_stamp()), - flags_(model.flags()) { - } - - void set_type(ui::EventType type) { type_ = type; } - - private: - void operator=(const Event&); - - NativeEvent native_event_; - ui::EventType type_; - base::Time time_stamp_; - int flags_; -}; - -//////////////////////////////////////////////////////////////////////////////// -// // LocatedEvent class // // A generic event that is used for any events that is located at a specific // position in the screen. // //////////////////////////////////////////////////////////////////////////////// -class VIEWS_EXPORT LocatedEvent : public Event { +class VIEWS_EXPORT LocatedEvent : public ui::Event { public: int x() const { return location_.x(); } int y() const { return location_.y(); } const gfx::Point& location() const { return location_; } protected: - explicit LocatedEvent(const NativeEvent& native_event); + explicit LocatedEvent(const ui::NativeEvent& native_event); // TODO(msw): Kill this legacy constructor when we update uses. // Simple initialization from cracked metadata. @@ -159,7 +73,7 @@ class VIEWS_EXPORT LocatedEvent : public Event { //////////////////////////////////////////////////////////////////////////////// class VIEWS_EXPORT MouseEvent : public LocatedEvent { public: - explicit MouseEvent(const NativeEvent& native_event); + explicit MouseEvent(const ui::NativeEvent& native_event); // Create a new MouseEvent which is identical to the provided model. // If source / target views are provided, the model location will be converted // from |source| coordinate system to |target| coordinate system. @@ -206,8 +120,6 @@ class VIEWS_EXPORT MouseEvent : public LocatedEvent { private: friend class internal::RootView; - - DISALLOW_COPY_AND_ASSIGN(MouseEvent); }; //////////////////////////////////////////////////////////////////////////////// @@ -221,7 +133,7 @@ class VIEWS_EXPORT MouseEvent : public LocatedEvent { //////////////////////////////////////////////////////////////////////////////// class VIEWS_EXPORT TouchEvent : public LocatedEvent { public: - explicit TouchEvent(const NativeEvent& native_event); + explicit TouchEvent(const ui::NativeEvent& native_event); // Create a new touch event. TouchEvent(ui::EventType type, @@ -287,7 +199,7 @@ class VIEWS_EXPORT MouseWheelEvent : public MouseEvent { // See |offset| for details. static const int kWheelDelta; - explicit MouseWheelEvent(const NativeEvent& native_event); + explicit MouseWheelEvent(const ui::NativeEvent& native_event); explicit MouseWheelEvent(const ScrollEvent& scroll_event); // The amount to scroll. This is in multiples of kWheelDelta. @@ -341,7 +253,7 @@ class VIEWS_EXPORT DropTargetEvent : public LocatedEvent { class VIEWS_EXPORT ScrollEvent : public MouseEvent { public: - explicit ScrollEvent(const NativeEvent& native_event); + explicit ScrollEvent(const ui::NativeEvent& native_event); float x_offset() const { return x_offset_; } float y_offset() const { return y_offset_; } @@ -367,7 +279,7 @@ class VIEWS_EXPORT ScrollEvent : public MouseEvent { //////////////////////////////////////////////////////////////////////////////// class VIEWS_EXPORT GestureEvent : public LocatedEvent { public: - explicit GestureEvent(const NativeEvent& native_event); + explicit GestureEvent(const ui::NativeEvent& native_event); // Create a new GestureEvent which is identical to the provided model. // If source / target views are provided, the model location will be converted diff --git a/ui/views/events/event_aura.cc b/ui/views/events/event_aura.cc index f2dd81d..50c126f 100644 --- a/ui/views/events/event_aura.cc +++ b/ui/views/events/event_aura.cc @@ -13,15 +13,17 @@ namespace views { //////////////////////////////////////////////////////////////////////////////// // LocatedEvent, protected: -LocatedEvent::LocatedEvent(const NativeEvent& native_event) - : Event(native_event, native_event->type(), native_event->flags()), +LocatedEvent::LocatedEvent(const ui::NativeEvent& native_event) + : Event(native_event->native_event(), + native_event->type(), + native_event->flags()), location_(static_cast<ui::LocatedEvent*>(native_event)->location()) { } //////////////////////////////////////////////////////////////////////////////// // TouchEvent, public: -TouchEvent::TouchEvent(const NativeEvent& event) +TouchEvent::TouchEvent(const ui::NativeEvent& event) : LocatedEvent(event), touch_id_(static_cast<ui::TouchEvent*>(event)->touch_id()), radius_x_(static_cast<ui::TouchEvent*>(event)->radius_x()), @@ -34,7 +36,7 @@ TouchEvent::TouchEvent(const NativeEvent& event) //////////////////////////////////////////////////////////////////////////////// // MouseWheelEvent, public: -MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event) +MouseWheelEvent::MouseWheelEvent(const ui::NativeEvent& native_event) : MouseEvent(native_event), offset_(ui::GetMouseWheelOffset(native_event->native_event())) { } @@ -42,7 +44,7 @@ MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event) //////////////////////////////////////////////////////////////////////////////// // ScrollEvent, public: -ScrollEvent::ScrollEvent(const NativeEvent& native_event) +ScrollEvent::ScrollEvent(const ui::NativeEvent& native_event) : MouseEvent(native_event) { CHECK(ui::GetScrollOffsets( native_event->native_event(), &x_offset_, &y_offset_)); @@ -51,7 +53,7 @@ ScrollEvent::ScrollEvent(const NativeEvent& native_event) //////////////////////////////////////////////////////////////////////////////// // GestureEvent, public: -GestureEvent::GestureEvent(const NativeEvent& event) +GestureEvent::GestureEvent(const ui::NativeEvent& event) : LocatedEvent(event), details_(static_cast<ui::GestureEvent*>(event)->details()) { } diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc index caa2457..841d177 100644 --- a/ui/views/examples/bubble_example.cc +++ b/ui/views/examples/bubble_example.cc @@ -71,7 +71,7 @@ void BubbleExample::CreateExampleView(View* container) { container->AddChildView(fade_out_); } -void BubbleExample::ButtonPressed(Button* sender, const Event& event) { +void BubbleExample::ButtonPressed(Button* sender, const ui::Event& event) { BubbleConfig config; if (sender == round_) config = kRoundConfig; diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h index ddb0549..08e97b9 100644 --- a/ui/views/examples/bubble_example.h +++ b/ui/views/examples/bubble_example.h @@ -21,7 +21,7 @@ class BubbleExample : public ExampleBase, public ButtonListener { virtual void CreateExampleView(View* container) OVERRIDE; private: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; Button* round_; Button* arrow_; diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc index dca7c8f..8f1c46f 100644 --- a/ui/views/examples/button_example.cc +++ b/ui/views/examples/button_example.cc @@ -55,7 +55,7 @@ void ButtonExample::CreateExampleView(View* container) { container->AddChildView(image_button_); } -void ButtonExample::ButtonPressed(Button* sender, const Event& event) { +void ButtonExample::ButtonPressed(Button* sender, const ui::Event& event) { PrintStatus("Pressed! count: %d", ++count_); if (event.IsControlDown()) { diff --git a/ui/views/examples/button_example.h b/ui/views/examples/button_example.h index 59973f5..09f6b3e 100644 --- a/ui/views/examples/button_example.h +++ b/ui/views/examples/button_example.h @@ -28,7 +28,7 @@ class ButtonExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // Example buttons. TextButton* text_button_; diff --git a/ui/views/examples/message_box_example.cc b/ui/views/examples/message_box_example.cc index e50d22a..1e38106 100644 --- a/ui/views/examples/message_box_example.cc +++ b/ui/views/examples/message_box_example.cc @@ -49,7 +49,7 @@ void MessageBoxExample::CreateExampleView(View* container) { layout->AddView(toggle_); } -void MessageBoxExample::ButtonPressed(Button* sender, const Event& event) { +void MessageBoxExample::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == status_) { message_box_view_->SetCheckBoxLabel( ASCIIToUTF16(BoolToOnOff(message_box_view_->IsCheckBoxSelected()))); diff --git a/ui/views/examples/message_box_example.h b/ui/views/examples/message_box_example.h index 0d915de4..4989787 100644 --- a/ui/views/examples/message_box_example.h +++ b/ui/views/examples/message_box_example.h @@ -28,7 +28,7 @@ class MessageBoxExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // The MessageBoxView to be tested. MessageBoxView* message_box_view_; diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc index ad42754..1e52a85 100644 --- a/ui/views/examples/native_theme_button_example.cc +++ b/ui/views/examples/native_theme_button_example.cc @@ -251,7 +251,7 @@ void NativeThemeButtonExample::CreateExampleView(View* container) { } void NativeThemeButtonExample::ButtonPressed(Button* sender, - const Event& event) { + const ui::Event& event) { PrintStatus(button_->MessWithState().c_str()); } diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h index 179439b..d8eaf81 100644 --- a/ui/views/examples/native_theme_button_example.h +++ b/ui/views/examples/native_theme_button_example.h @@ -78,7 +78,7 @@ class NativeThemeButtonExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; ExampleNativeThemeButton* button_; diff --git a/ui/views/examples/native_theme_checkbox_example.cc b/ui/views/examples/native_theme_checkbox_example.cc index 8112989..3ad9ba4 100644 --- a/ui/views/examples/native_theme_checkbox_example.cc +++ b/ui/views/examples/native_theme_checkbox_example.cc @@ -29,7 +29,7 @@ void NativeThemeCheckboxExample::CreateExampleView(View* container) { } void NativeThemeCheckboxExample::ButtonPressed(Button* sender, - const Event& event) { + const ui::Event& event) { PrintStatus(base::StringPrintf("Pressed! count: %d", ++count_).c_str()); } diff --git a/ui/views/examples/native_theme_checkbox_example.h b/ui/views/examples/native_theme_checkbox_example.h index 8cb9ba1..517afb1 100644 --- a/ui/views/examples/native_theme_checkbox_example.h +++ b/ui/views/examples/native_theme_checkbox_example.h @@ -26,7 +26,7 @@ class NativeThemeCheckboxExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // The only control in this test. Checkbox* button_; diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc index 223074f..f1142aa 100644 --- a/ui/views/examples/progress_bar_example.cc +++ b/ui/views/examples/progress_bar_example.cc @@ -59,7 +59,7 @@ void ProgressBarExample::CreateExampleView(View* container) { layout->AddView(plus_button_); } -void ProgressBarExample::ButtonPressed(Button* sender, const Event& event) { +void ProgressBarExample::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == minus_button_) current_percent_ = ClampToMin(current_percent_ - kStepSize); else if (sender == plus_button_) diff --git a/ui/views/examples/progress_bar_example.h b/ui/views/examples/progress_bar_example.h index a2fdcd9a..92d0e9f 100644 --- a/ui/views/examples/progress_bar_example.h +++ b/ui/views/examples/progress_bar_example.h @@ -25,7 +25,7 @@ class ProgressBarExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* button, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; Button* minus_button_; Button* plus_button_; diff --git a/ui/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc index 42a6ea9..4c309ce 100644 --- a/ui/views/examples/radio_button_example.cc +++ b/ui/views/examples/radio_button_example.cc @@ -50,7 +50,7 @@ void RadioButtonExample::CreateExampleView(View* container) { layout->AddView(status_); } -void RadioButtonExample::ButtonPressed(Button* sender, const Event& event) { +void RadioButtonExample::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == select_) { radio_buttons_[2]->SetChecked(true); } else if (sender == status_) { diff --git a/ui/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h index 49deec8..626cd13 100644 --- a/ui/views/examples/radio_button_example.h +++ b/ui/views/examples/radio_button_example.h @@ -29,7 +29,7 @@ class RadioButtonExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // Group of 3 radio buttons. RadioButton* radio_buttons_[3]; diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc index a0f293f..3dc4d084 100644 --- a/ui/views/examples/scroll_view_example.cc +++ b/ui/views/examples/scroll_view_example.cc @@ -89,7 +89,7 @@ void ScrollViewExample::CreateExampleView(View* container) { layout->AddView(scroll_to_); } -void ScrollViewExample::ButtonPressed(Button* sender, const Event& event) { +void ScrollViewExample::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == wide_) { scrollable_->SetBounds(0, 0, 1000, 100); scrollable_->SetColor(SK_ColorYELLOW, SK_ColorCYAN); diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h index e57fc79..436f48b 100644 --- a/ui/views/examples/scroll_view_example.h +++ b/ui/views/examples/scroll_view_example.h @@ -26,7 +26,7 @@ class ScrollViewExample : public ExampleBase, public ButtonListener { private: // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // Control buttons to change the size of scrollable and jump to // predefined position. diff --git a/ui/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc index 894c088..b92d928 100644 --- a/ui/views/examples/tabbed_pane_example.cc +++ b/ui/views/examples/tabbed_pane_example.cc @@ -54,7 +54,7 @@ void TabbedPaneExample::CreateExampleView(View* container) { layout->AddView(select_at_); } -void TabbedPaneExample::ButtonPressed(Button* sender, const Event& event) { +void TabbedPaneExample::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == add_) { AddButton("Added"); } else if (sender == add_at_) { diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h index 43ff22c..f9377a3 100644 --- a/ui/views/examples/tabbed_pane_example.h +++ b/ui/views/examples/tabbed_pane_example.h @@ -31,7 +31,7 @@ class TabbedPaneExample : public ExampleBase, private: // ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // TabbedPaneListener: virtual void TabSelectedAt(int index) OVERRIDE; diff --git a/ui/views/examples/table_example.cc b/ui/views/examples/table_example.cc index 51ab1d3..b7f84ff 100644 --- a/ui/views/examples/table_example.cc +++ b/ui/views/examples/table_example.cc @@ -137,7 +137,7 @@ void TableExample::OnTableViewDelete(TableView* table_view) {} void TableExample::OnTableView2Delete(TableView2* table_view) {} -void TableExample::ButtonPressed(Button* sender, const Event& event) { +void TableExample::ButtonPressed(Button* sender, const ui::Event& event) { #if defined(OS_WIN) && !defined(USE_AURA) int index = 0; bool show = true; diff --git a/ui/views/examples/table_example.h b/ui/views/examples/table_example.h index db7d901..56df8a3 100644 --- a/ui/views/examples/table_example.h +++ b/ui/views/examples/table_example.h @@ -53,7 +53,7 @@ class TableExample : public ExampleBase, virtual void OnTableView2Delete(TableView2* table_view) OVERRIDE; // ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; private: // The table to be tested. diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc index d8db070..e6298e2 100644 --- a/ui/views/examples/text_example.cc +++ b/ui/views/examples/text_example.cc @@ -260,8 +260,7 @@ void TextExample::CreateExampleView(View* container) { layout->AddPaddingRow(0, 8); } -void TextExample::ButtonPressed(Button* button, - const Event& event) { +void TextExample::ButtonPressed(Button* button, const ui::Event& event) { int flags = text_view_->text_flags(); int style = text_view_->GetFontStyle(); SetFlagFromCheckbox(multiline_checkbox_, &flags, gfx::Canvas::MULTI_LINE); diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h index b814b4d..3284990 100644 --- a/ui/views/examples/text_example.h +++ b/ui/views/examples/text_example.h @@ -41,7 +41,7 @@ class TextExample : public ExampleBase, int count); // Overridden from ButtonListener: - virtual void ButtonPressed(Button* button, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE; // Overridden from ComboboxListener: virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE; diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc index 1a87d20..57b7e87 100644 --- a/ui/views/examples/textfield_example.cc +++ b/ui/views/examples/textfield_example.cc @@ -74,8 +74,7 @@ bool TextfieldExample::HandleKeyEvent(Textfield* sender, return false; } -void TextfieldExample::ButtonPressed(Button* sender, - const Event& event) { +void TextfieldExample::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == show_password_) { PrintStatus("Password [%s]", UTF16ToUTF8(password_->text()).c_str()); } else if (sender == clear_all_) { diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h index 1ca0954..c479509 100644 --- a/ui/views/examples/textfield_example.h +++ b/ui/views/examples/textfield_example.h @@ -36,7 +36,7 @@ class TextfieldExample : public ExampleBase, const ui::KeyEvent& key_event) OVERRIDE; // ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // Textfields for name and password. Textfield* name_; diff --git a/ui/views/examples/tree_view_example.cc b/ui/views/examples/tree_view_example.cc index 3bdb447..f971ab1 100644 --- a/ui/views/examples/tree_view_example.cc +++ b/ui/views/examples/tree_view_example.cc @@ -90,7 +90,7 @@ bool TreeViewExample::IsCommandIdEnabled(int command_id) { tree_view_->GetSelectedNode() != model_.GetRoot(); } -void TreeViewExample::ButtonPressed(Button* sender, const Event& event) { +void TreeViewExample::ButtonPressed(Button* sender, const ui::Event& event) { NodeType* selected_node = static_cast<NodeType*>(tree_view_->GetSelectedNode()); if (sender == add_) { diff --git a/ui/views/examples/tree_view_example.h b/ui/views/examples/tree_view_example.h index b2f1ea9..a832bda 100644 --- a/ui/views/examples/tree_view_example.h +++ b/ui/views/examples/tree_view_example.h @@ -48,7 +48,7 @@ class TreeViewExample : public ExampleBase, bool IsCommandIdEnabled(int command_id); // ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; // TreeViewController: virtual void OnTreeViewSelectionChanged(TreeView* tree_view) OVERRIDE; diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc index 2a635f5..ed45ebe 100644 --- a/ui/views/examples/widget_example.cc +++ b/ui/views/examples/widget_example.cc @@ -142,7 +142,7 @@ void WidgetExample::CreatePopup(View* parent, bool transparent) { InitWidget(widget, transparent); } -void WidgetExample::ButtonPressed(Button* sender, const Event& event) { +void WidgetExample::ButtonPressed(Button* sender, const ui::Event& event) { switch (sender->tag()) { case POPUP: CreatePopup(sender, false); diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h index fe32887d..88a8c42 100644 --- a/ui/views/examples/widget_example.h +++ b/ui/views/examples/widget_example.h @@ -45,7 +45,7 @@ class WidgetExample : public ExampleBase, public ButtonListener { void CreatePopup(View* parent, bool transparent); // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; DISALLOW_COPY_AND_ASSIGN(WidgetExample); }; diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index d00be25..aa522d5 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -273,8 +273,7 @@ class TouchSelectionControllerImpl::TouchContextMenuView } // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, - const views::Event& event) OVERRIDE { + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { controller_->ExecuteCommand(sender->tag()); } diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index ffd47f4..04d3874 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -1622,7 +1622,7 @@ class TestDialog : public DialogDelegate, public ButtonListener { } // ButtonListener implementation. - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE { + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { last_pressed_button_ = sender; } diff --git a/ui/views/views_delegate.h b/ui/views/views_delegate.h index f4d03e3..5fb3929 100644 --- a/ui/views/views_delegate.h +++ b/ui/views/views_delegate.h @@ -104,7 +104,7 @@ class VIEWS_EXPORT ViewsDelegate { virtual void AddRef() = 0; virtual void ReleaseRef() = 0; - // Converts views::Event::flags to a WindowOpenDisposition. + // Converts ui::Event::flags to a WindowOpenDisposition. virtual int GetDispositionForEvent(int event_flags) = 0; #if defined(USE_AURA) diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 6d06bf6..7ae53eb 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -54,16 +54,9 @@ void BuildRootLayers(View* view, std::vector<ui::Layer*>* layers) { // restore any previously active event afterwards. class ScopedEvent { public: - ScopedEvent(Widget* widget, const Event& event) + ScopedEvent(Widget* widget, const ui::Event& event) : widget_(widget), - event_(&event), - ui_event_(NULL) { - widget->event_stack_.push(this); - } - ScopedEvent(Widget* widget, const ui::Event& ui_event) - : widget_(widget), - event_(NULL), - ui_event_(&ui_event) { + event_(&event) { widget->event_stack_.push(this); } @@ -76,18 +69,13 @@ class ScopedEvent { widget_ = NULL; } - const Event* event() { + const ui::Event* event() { return event_; } - const ui::Event* ui_event() { - return ui_event_; - } private: Widget* widget_; - const Event* event_; - // TODO(beng): remove once views::Event is gone. - const ui::Event* ui_event_; + const ui::Event* event_; DISALLOW_COPY_AND_ASSIGN(ScopedEvent); }; @@ -882,7 +870,7 @@ bool Widget::HasCapture() { return native_widget_->HasCapture(); } -const Event* Widget::GetCurrentEvent() { +const ui::Event* Widget::GetCurrentEvent() { return event_stack_.empty() ? NULL : event_stack_.top()->event(); } diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index 2132b35..88ca161 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -579,7 +579,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // being processed at the same time (e.g. one event triggers another event), // then the most recent event is returned. Returns NULL if no event is being // processed. - const Event* GetCurrentEvent(); + const ui::Event* GetCurrentEvent(); // Invoked when the tooltip text changes for the specified views. void TooltipTextChanged(View* view); diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index 478ae33..e94fcd4 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc @@ -238,7 +238,7 @@ gfx::Size CustomFrameView::GetPreferredSize() { /////////////////////////////////////////////////////////////////////////////// // CustomFrameView, ButtonListener implementation: -void CustomFrameView::ButtonPressed(Button* sender, const Event& event) { +void CustomFrameView::ButtonPressed(Button* sender, const ui::Event& event) { if (sender == close_button_) frame_->Close(); else if (sender == minimize_button_) diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h index 04e74ef..8e7d60b 100644 --- a/ui/views/window/custom_frame_view.h +++ b/ui/views/window/custom_frame_view.h @@ -53,7 +53,7 @@ class CustomFrameView : public NonClientFrameView, virtual gfx::Size GetPreferredSize() OVERRIDE; // Overridden from ButtonListener: - virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE; + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; private: // Returns the thickness of the border that makes up the window frame edges. diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index e27c08f..1c289d3 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -367,8 +367,7 @@ bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) { //////////////////////////////////////////////////////////////////////////////// // DialogClientView, ButtonListener implementation: -void DialogClientView::ButtonPressed( - Button* sender, const views::Event& event) { +void DialogClientView::ButtonPressed(Button* sender, const ui::Event& event) { // We NULL check the delegate here since the buttons can receive WM_COMMAND // messages even after they (and the window containing us) are destroyed. if (!GetDialogDelegate()) diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h index 977891e..ad84e36 100644 --- a/ui/views/window/dialog_client_view.h +++ b/ui/views/window/dialog_client_view.h @@ -87,7 +87,7 @@ class VIEWS_EXPORT DialogClientView : public ClientView, // ButtonListener implementation: virtual void ButtonPressed(Button* sender, - const views::Event& event) OVERRIDE; + const ui::Event& event) OVERRIDE; private: // Paint the size box in the bottom right corner of the window if it is |