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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 189 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
190 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 190 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
191 virtual void OnWindowDestroying() OVERRIDE; 191 virtual void OnWindowDestroying() OVERRIDE;
192 virtual void OnWindowDestroyed() OVERRIDE; 192 virtual void OnWindowDestroyed() OVERRIDE;
193 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 193 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
194 virtual bool HasHitTestMask() const OVERRIDE; 194 virtual bool HasHitTestMask() const OVERRIDE;
195 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 195 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
196 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 196 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
197 197
198 // Overridden from ui::EventHandler: 198 // Overridden from ui::EventHandler:
199 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 199 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
200 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 200 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
201 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 201 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
202 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 202 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
203 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 203 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
204 204
205 // Overridden from aura::client::ActivationDelegate: 205 // Overridden from aura::client::ActivationDelegate:
206 virtual bool ShouldActivate() const OVERRIDE; 206 virtual bool ShouldActivate() const OVERRIDE;
207 207
208 // Overridden from aura::client::ActivationChangeObserver: 208 // Overridden from aura::client::ActivationChangeObserver:
209 virtual void OnWindowActivated(aura::Window* gained_activation, 209 virtual void OnWindowActivated(aura::Window* gained_activation,
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 NO_PENDING_COMMIT, 437 NO_PENDING_COMMIT,
438 }; 438 };
439 CanLockCompositorState can_lock_compositor_; 439 CanLockCompositorState can_lock_compositor_;
440 440
441 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 441 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
442 }; 442 };
443 443
444 } // namespace content 444 } // namespace content
445 445
446 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 446 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/input/input.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698