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

Side by Side Diff: content/browser/web_contents/web_contents_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_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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 144 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
145 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 145 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
146 virtual void OnWindowDestroying() OVERRIDE; 146 virtual void OnWindowDestroying() OVERRIDE;
147 virtual void OnWindowDestroyed() OVERRIDE; 147 virtual void OnWindowDestroyed() OVERRIDE;
148 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 148 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
149 virtual bool HasHitTestMask() const OVERRIDE; 149 virtual bool HasHitTestMask() const OVERRIDE;
150 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 150 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
151 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 151 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
152 152
153 // Overridden from ui::EventHandler: 153 // Overridden from ui::EventHandler:
154 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 154 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
155 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 155 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
156 156
157 // Overridden from aura::client::DragDropDelegate: 157 // Overridden from aura::client::DragDropDelegate:
158 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 158 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
159 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 159 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
160 virtual void OnDragExited() OVERRIDE; 160 virtual void OnDragExited() OVERRIDE;
161 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 161 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
162 162
163 scoped_ptr<aura::Window> window_; 163 scoped_ptr<aura::Window> window_;
164 scoped_ptr<aura::Window> overscroll_window_; 164 scoped_ptr<aura::Window> overscroll_window_;
(...skipping 23 matching lines...) Expand all
188 // This is the completed overscroll gesture. This is used for the animation 188 // This is the completed overscroll gesture. This is used for the animation
189 // callback that happens in response to a completed overscroll gesture. 189 // callback that happens in response to a completed overscroll gesture.
190 OverscrollMode completed_overscroll_gesture_; 190 OverscrollMode completed_overscroll_gesture_;
191 191
192 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 192 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
193 }; 193 };
194 194
195 } // namespace content 195 } // namespace content
196 196
197 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 197 #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