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

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

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; 163 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE;
164 virtual void OnBlur() OVERRIDE; 164 virtual void OnBlur() OVERRIDE;
165 virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 165 virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
166 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; 166 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
167 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 167 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
168 virtual bool ShouldDescendIntoChildForEventHandling( 168 virtual bool ShouldDescendIntoChildForEventHandling(
169 aura::Window* child, 169 aura::Window* child,
170 const gfx::Point& location) OVERRIDE; 170 const gfx::Point& location) OVERRIDE;
171 virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 171 virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
172 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 172 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
173 virtual ui::GestureStatus OnGestureEvent( 173 virtual ui::EventResult OnGestureEvent(
174 ui::GestureEvent* event) OVERRIDE; 174 ui::GestureEvent* event) OVERRIDE;
175 virtual bool CanFocus() OVERRIDE; 175 virtual bool CanFocus() OVERRIDE;
176 virtual void OnCaptureLost() OVERRIDE; 176 virtual void OnCaptureLost() OVERRIDE;
177 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 177 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
178 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 178 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
179 virtual void OnWindowDestroying() OVERRIDE; 179 virtual void OnWindowDestroying() OVERRIDE;
180 virtual void OnWindowDestroyed() OVERRIDE; 180 virtual void OnWindowDestroyed() OVERRIDE;
181 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 181 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
182 virtual bool HasHitTestMask() const OVERRIDE; 182 virtual bool HasHitTestMask() const OVERRIDE;
183 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 183 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 377
378 // This lock is for waiting for a front surface to become available to draw. 378 // This lock is for waiting for a front surface to become available to draw.
379 scoped_refptr<aura::CompositorLock> released_front_lock_; 379 scoped_refptr<aura::CompositorLock> released_front_lock_;
380 380
381 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 381 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
382 }; 382 };
383 383
384 } // namespace content 384 } // namespace content
385 385
386 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 386 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.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