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

Side by Side Diff: ash/wm/toplevel_window_event_handler.h

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/system_modal_container_event_filter.cc ('k') | ash/wm/toplevel_window_event_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ 5 #ifndef ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
6 #define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ 6 #define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 20 matching lines...) Expand all
31 31
32 class ASH_EXPORT ToplevelWindowEventHandler 32 class ASH_EXPORT ToplevelWindowEventHandler
33 : public ui::EventHandler, 33 : public ui::EventHandler,
34 public aura::client::WindowMoveClient, 34 public aura::client::WindowMoveClient,
35 public DisplayController::Observer { 35 public DisplayController::Observer {
36 public: 36 public:
37 explicit ToplevelWindowEventHandler(aura::Window* owner); 37 explicit ToplevelWindowEventHandler(aura::Window* owner);
38 virtual ~ToplevelWindowEventHandler(); 38 virtual ~ToplevelWindowEventHandler();
39 39
40 // Overridden from ui::EventHandler: 40 // Overridden from ui::EventHandler:
41 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 41 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
42 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 42 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
43 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 43 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
44 44
45 // Overridden form aura::client::WindowMoveClient: 45 // Overridden form aura::client::WindowMoveClient:
46 virtual aura::client::WindowMoveResult RunMoveLoop( 46 virtual aura::client::WindowMoveResult RunMoveLoop(
47 aura::Window* source, 47 aura::Window* source,
48 const gfx::Vector2d& drag_offset) OVERRIDE; 48 const gfx::Vector2d& drag_offset) OVERRIDE;
49 virtual void EndMoveLoop() OVERRIDE; 49 virtual void EndMoveLoop() OVERRIDE;
50 50
51 // Overridden form ash::DisplayController::Observer: 51 // Overridden form ash::DisplayController::Observer:
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // Used to track if this object is deleted while running a nested message 111 // Used to track if this object is deleted while running a nested message
112 // loop. If non-null the destructor sets this to true. 112 // loop. If non-null the destructor sets this to true.
113 bool* destroyed_; 113 bool* destroyed_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(ToplevelWindowEventHandler); 115 DISALLOW_COPY_AND_ASSIGN(ToplevelWindowEventHandler);
116 }; 116 };
117 117
118 } // namespace aura 118 } // namespace aura
119 119
120 #endif // ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ 120 #endif // ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
OLDNEW
« no previous file with comments | « ash/wm/system_modal_container_event_filter.cc ('k') | ash/wm/toplevel_window_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698