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

Side by Side Diff: ui/views/corewm/window_modality_controller.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
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 UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ 5 #ifndef UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_
6 #define UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ 6 #define UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 20 matching lines...) Expand all
31 // windows that are the transient parents of window-modal windows. This filter 31 // windows that are the transient parents of window-modal windows. This filter
32 // must be added to the CompoundEventFilter so that activation works properly. 32 // must be added to the CompoundEventFilter so that activation works properly.
33 class VIEWS_EXPORT WindowModalityController : public ui::EventHandler, 33 class VIEWS_EXPORT WindowModalityController : public ui::EventHandler,
34 public aura::EnvObserver, 34 public aura::EnvObserver,
35 public aura::WindowObserver { 35 public aura::WindowObserver {
36 public: 36 public:
37 WindowModalityController(); 37 WindowModalityController();
38 virtual ~WindowModalityController(); 38 virtual ~WindowModalityController();
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 OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 43 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
44 44
45 // Overridden from aura::EnvObserver: 45 // Overridden from aura::EnvObserver:
46 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; 46 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
47 47
48 // Overridden from aura::WindowObserver: 48 // Overridden from aura::WindowObserver:
49 virtual void OnWindowPropertyChanged(aura::Window* window, 49 virtual void OnWindowPropertyChanged(aura::Window* window,
50 const void* key, 50 const void* key,
51 intptr_t old) OVERRIDE; 51 intptr_t old) OVERRIDE;
52 virtual void OnWindowVisibilityChanged(aura::Window* window, 52 virtual void OnWindowVisibilityChanged(aura::Window* window,
53 bool visible) OVERRIDE; 53 bool visible) OVERRIDE;
54 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 54 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
55 55
56 private: 56 private:
57 // Processes a mouse/touch event, and returns true if the event should be 57 // Processes a mouse/touch event, and returns true if the event should be
58 // consumed. 58 // consumed.
59 bool ProcessLocatedEvent(aura::Window* target, 59 bool ProcessLocatedEvent(aura::Window* target,
60 ui::LocatedEvent* event); 60 ui::LocatedEvent* event);
61 61
62 std::vector<aura::Window*> windows_; 62 std::vector<aura::Window*> windows_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(WindowModalityController); 64 DISALLOW_COPY_AND_ASSIGN(WindowModalityController);
65 }; 65 };
66 66
67 } // namespace corewm 67 } // namespace corewm
68 } // namespace views 68 } // namespace views
69 69
70 #endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_ 70 #endif // UI_VIEWS_COREWM_WINDOW_MODALITY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/input_method_event_filter.cc ('k') | ui/views/corewm/window_modality_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698