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

Side by Side Diff: ash/wm/activation_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
« no previous file with comments | « ash/tooltips/tooltip_controller.cc ('k') | ash/wm/activation_controller.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_ACTIVATION_CONTROLLER_H_ 5 #ifndef ASH_WM_ACTIVATION_CONTROLLER_H_
6 #define ASH_WM_ACTIVATION_CONTROLLER_H_ 6 #define ASH_WM_ACTIVATION_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 // Overridden from aura::EnvObserver: 69 // Overridden from aura::EnvObserver:
70 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; 70 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
71 71
72 // Overridden from aura::client::FocusChangeObserver: 72 // Overridden from aura::client::FocusChangeObserver:
73 virtual void OnWindowFocused(aura::Window* gained_focus, 73 virtual void OnWindowFocused(aura::Window* gained_focus,
74 aura::Window* lost_focus) OVERRIDE; 74 aura::Window* lost_focus) OVERRIDE;
75 75
76 private: 76 private:
77 // Overridden from ui::EventHandler: 77 // Overridden from ui::EventHandler:
78 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 78 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
79 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 79 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
80 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 80 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
81 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 81 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
82 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 82 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
83 83
84 // Implementation of ActivateWindow() with an Event. 84 // Implementation of ActivateWindow() with an Event.
85 void ActivateWindowWithEvent(aura::Window* window, 85 void ActivateWindowWithEvent(aura::Window* window,
86 const ui::Event* event); 86 const ui::Event* event);
87 87
88 // Shifts activation to the next window, ignoring |window|. Returns the next 88 // Shifts activation to the next window, ignoring |window|. Returns the next
(...skipping 28 matching lines...) Expand all
117 117
118 scoped_ptr<ActivationControllerDelegate> delegate_; 118 scoped_ptr<ActivationControllerDelegate> delegate_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(ActivationController); 120 DISALLOW_COPY_AND_ASSIGN(ActivationController);
121 }; 121 };
122 122
123 } // namespace internal 123 } // namespace internal
124 } // namespace ash 124 } // namespace ash
125 125
126 #endif // ASH_WM_ACTIVATION_CONTROLLER_H_ 126 #endif // ASH_WM_ACTIVATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/tooltips/tooltip_controller.cc ('k') | ash/wm/activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698