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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 virtual void OnWindowDestroying() OVERRIDE; 193 virtual void OnWindowDestroying() OVERRIDE;
194 virtual void OnWindowDestroyed() OVERRIDE; 194 virtual void OnWindowDestroyed() OVERRIDE;
195 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 195 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
196 virtual bool HasHitTestMask() const OVERRIDE; 196 virtual bool HasHitTestMask() const OVERRIDE;
197 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 197 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
198 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 198 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
199 199
200 // Overridden from ui::EventHandler: 200 // Overridden from ui::EventHandler:
201 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 201 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
202 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 202 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
203 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 203 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
204 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 204 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
205 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 205 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
206 206
207 // Overridden from aura::client::ActivationDelegate: 207 // Overridden from aura::client::ActivationDelegate:
208 virtual bool ShouldActivate() const OVERRIDE; 208 virtual bool ShouldActivate() const OVERRIDE;
209 209
210 // Overridden from aura::client::ActivationChangeObserver: 210 // Overridden from aura::client::ActivationChangeObserver:
211 virtual void OnWindowActivated(aura::Window* gained_activation, 211 virtual void OnWindowActivated(aura::Window* gained_activation,
212 aura::Window* lost_activation) OVERRIDE; 212 aura::Window* lost_activation) OVERRIDE;
213 213
214 // Overridden from aura::client::FocusChangeObserver: 214 // Overridden from aura::client::FocusChangeObserver:
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 NO_PENDING_COMMIT, 439 NO_PENDING_COMMIT,
440 }; 440 };
441 CanLockCompositorState can_lock_compositor_; 441 CanLockCompositorState can_lock_compositor_;
442 442
443 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 443 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
444 }; 444 };
445 445
446 } // namespace content 446 } // namespace content
447 447
448 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 448 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/tab_scrubber.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