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

Unified Diff: ash/wm/shelf_layout_manager.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/system_gesture_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/shelf_layout_manager.cc
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index dce2fd2f229fae6934df04afc99c566ff00bd2e5..a04a05f52020af5b53cb1b0b85442de7d8a0bbdb 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -74,7 +74,7 @@ class ShelfLayoutManager::AutoHideEventFilter : public ui::EventHandler {
bool in_mouse_drag() const { return in_mouse_drag_; }
// Overridden from ui::EventHandler:
- virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
+ virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
private:
ShelfLayoutManager* shelf_;
@@ -94,7 +94,7 @@ ShelfLayoutManager::AutoHideEventFilter::~AutoHideEventFilter() {
Shell::GetInstance()->RemovePreTargetHandler(this);
}
-ui::EventResult ShelfLayoutManager::AutoHideEventFilter::OnMouseEvent(
+void ShelfLayoutManager::AutoHideEventFilter::OnMouseEvent(
ui::MouseEvent* event) {
// This also checks IsShelfWindow() to make sure we don't attempt to hide the
// shelf if the mouse down occurs on the shelf.
@@ -104,7 +104,7 @@ ui::EventResult ShelfLayoutManager::AutoHideEventFilter::OnMouseEvent(
!shelf_->IsShelfWindow(static_cast<aura::Window*>(event->target()));
if (event->type() == ui::ET_MOUSE_MOVED)
shelf_->UpdateAutoHideState();
- return ui::ER_UNHANDLED;
+ return;
}
// ShelfLayoutManager:UpdateShelfObserver --------------------------------------
« no previous file with comments | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/system_gesture_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698