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

Side by Side Diff: ui/views/widget/native_widget_aura.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_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/activation_change_observer.h" 10 #include "ui/aura/client/activation_change_observer.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 149 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
150 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 150 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
151 virtual void OnWindowDestroying() OVERRIDE; 151 virtual void OnWindowDestroying() OVERRIDE;
152 virtual void OnWindowDestroyed() OVERRIDE; 152 virtual void OnWindowDestroyed() OVERRIDE;
153 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 153 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
154 virtual bool HasHitTestMask() const OVERRIDE; 154 virtual bool HasHitTestMask() const OVERRIDE;
155 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 155 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
156 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 156 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
157 157
158 // Overridden from ui::EventHandler: 158 // Overridden from ui::EventHandler:
159 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 159 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
160 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 160 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
161 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 161 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
162 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 162 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
163 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 163 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
164 164
165 // Overridden from aura::client::ActivationDelegate: 165 // Overridden from aura::client::ActivationDelegate:
166 virtual bool ShouldActivate() const OVERRIDE; 166 virtual bool ShouldActivate() const OVERRIDE;
167 167
168 // Overridden from aura::client::ActivationChangeObserver: 168 // Overridden from aura::client::ActivationChangeObserver:
169 virtual void OnWindowActivated(aura::Window* gained_active, 169 virtual void OnWindowActivated(aura::Window* gained_active,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 217
218 scoped_ptr<DropHelper> drop_helper_; 218 scoped_ptr<DropHelper> drop_helper_;
219 int last_drop_operation_; 219 int last_drop_operation_;
220 220
221 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 221 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
222 }; 222 };
223 223
224 } // namespace views 224 } // namespace views
225 225
226 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 226 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_native_widget_aura.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698