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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 virtual void OnWindowDestroying() OVERRIDE; 148 virtual void OnWindowDestroying() OVERRIDE;
149 virtual void OnWindowDestroyed() OVERRIDE; 149 virtual void OnWindowDestroyed() OVERRIDE;
150 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 150 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
151 virtual bool HasHitTestMask() const OVERRIDE; 151 virtual bool HasHitTestMask() const OVERRIDE;
152 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 152 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
153 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 153 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
154 154
155 // Overridden from ui::EventHandler: 155 // Overridden from ui::EventHandler:
156 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 156 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
157 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 157 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
158 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
159 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
160 158
161 // Overridden from aura::client::DragDropDelegate: 159 // Overridden from aura::client::DragDropDelegate:
162 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 160 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
163 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 161 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
164 virtual void OnDragExited() OVERRIDE; 162 virtual void OnDragExited() OVERRIDE;
165 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 163 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
166 164
167 scoped_ptr<aura::Window> window_; 165 scoped_ptr<aura::Window> window_;
168 scoped_ptr<aura::Window> overscroll_window_; 166 scoped_ptr<aura::Window> overscroll_window_;
169 167
(...skipping 24 matching lines...) Expand all
194 // This is the completed overscroll gesture. This is used for the animation 192 // This is the completed overscroll gesture. This is used for the animation
195 // callback that happens in response to a completed overscroll gesture. 193 // callback that happens in response to a completed overscroll gesture.
196 OverscrollMode completed_overscroll_gesture_; 194 OverscrollMode completed_overscroll_gesture_;
197 195
198 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 196 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
199 }; 197 };
200 198
201 } // namespace content 199 } // namespace content
202 200
203 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 201 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698