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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_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_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_change_observer.h" 9 #include "ui/aura/client/activation_change_observer.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 164 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
165 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 165 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
166 virtual void OnWindowDestroying() OVERRIDE; 166 virtual void OnWindowDestroying() OVERRIDE;
167 virtual void OnWindowDestroyed() OVERRIDE; 167 virtual void OnWindowDestroyed() OVERRIDE;
168 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 168 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
169 virtual bool HasHitTestMask() const OVERRIDE; 169 virtual bool HasHitTestMask() const OVERRIDE;
170 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 170 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
171 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 171 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
172 172
173 // Overridden from ui::EventHandler: 173 // Overridden from ui::EventHandler:
174 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 174 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
175 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 175 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
176 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 176 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
177 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 177 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
178 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 178 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
179 179
180 // Overridden from aura::client::ActivationDelegate: 180 // Overridden from aura::client::ActivationDelegate:
181 virtual bool ShouldActivate() const OVERRIDE; 181 virtual bool ShouldActivate() const OVERRIDE;
182 182
183 // Overridden from aura::client::ActivationChangeObserver: 183 // Overridden from aura::client::ActivationChangeObserver:
184 virtual void OnWindowActivated(aura::Window* gained_active, 184 virtual void OnWindowActivated(aura::Window* gained_active,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 // See comments in OnLostActive(). 232 // See comments in OnLostActive().
233 bool restore_focus_on_activate_; 233 bool restore_focus_on_activate_;
234 234
235 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 235 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
236 }; 236 };
237 237
238 } // namespace views 238 } // namespace views
239 239
240 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 240 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_activation_client.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698