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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.h ('k') | chrome/browser/ui/views/reload_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
===================================================================
--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc (revision 151406)
+++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc (working copy)
@@ -98,7 +98,7 @@
return omnibox_view_->HandleKeyReleaseEvent(event);
}
- virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
+ virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
// Pass through the views::Textfield's return value; we don't need to
// override its behavior.
bool result = views::Textfield::OnMousePressed(event);
@@ -106,13 +106,13 @@
return result;
}
- virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE {
+ virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE {
bool result = views::Textfield::OnMouseDragged(event);
omnibox_view_->HandleMouseDragEvent(event);
return result;
}
- virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE {
+ virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE {
views::Textfield::OnMouseReleased(event);
omnibox_view_->HandleMouseReleaseEvent(event);
}
@@ -382,17 +382,17 @@
return false;
}
-void OmniboxViewViews::HandleMousePressEvent(const views::MouseEvent& event) {
+void OmniboxViewViews::HandleMousePressEvent(const ui::MouseEvent& event) {
select_all_on_mouse_release_ =
(event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
!textfield_->HasFocus();
}
-void OmniboxViewViews::HandleMouseDragEvent(const views::MouseEvent& event) {
+void OmniboxViewViews::HandleMouseDragEvent(const ui::MouseEvent& event) {
select_all_on_mouse_release_ = false;
}
-void OmniboxViewViews::HandleMouseReleaseEvent(const views::MouseEvent& event) {
+void OmniboxViewViews::HandleMouseReleaseEvent(const ui::MouseEvent& event) {
if ((event.IsOnlyLeftMouseButton() || event.IsOnlyRightMouseButton()) &&
select_all_on_mouse_release_) {
// Select all in the reverse direction so as not to scroll the caret
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.h ('k') | chrome/browser/ui/views/reload_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698