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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_delegate.h" 9 #include "ui/aura/client/activation_delegate.h"
10 #include "ui/aura/window_delegate.h" 10 #include "ui/aura/window_delegate.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; 146 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
147 virtual bool HasHitTestMask() const OVERRIDE; 147 virtual bool HasHitTestMask() const OVERRIDE;
148 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 148 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
149 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 149 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
150 150
151 // Overridden from ui::EventHandler: 151 // Overridden from ui::EventHandler:
152 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 152 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
153 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 153 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
154 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 154 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
155 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 155 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
156 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 156 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
157 157
158 // Overridden from aura::client::ActivationDelegate: 158 // Overridden from aura::client::ActivationDelegate:
159 virtual bool ShouldActivate() const OVERRIDE; 159 virtual bool ShouldActivate() const OVERRIDE;
160 virtual void OnActivated() OVERRIDE; 160 virtual void OnActivated() OVERRIDE;
161 virtual void OnLostActive() OVERRIDE; 161 virtual void OnLostActive() OVERRIDE;
162 162
163 private: 163 private:
164 // See class documentation for Widget in widget.h for a note about ownership. 164 // See class documentation for Widget in widget.h for a note about ownership.
165 Widget::InitParams::Ownership ownership_; 165 Widget::InitParams::Ownership ownership_;
166 166
(...skipping 16 matching lines...) Expand all
183 internal::NativeWidgetDelegate* native_widget_delegate_; 183 internal::NativeWidgetDelegate* native_widget_delegate_;
184 184
185 scoped_ptr<aura::client::StackingClient> stacking_client_; 185 scoped_ptr<aura::client::StackingClient> stacking_client_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 187 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
188 }; 188 };
189 189
190 } // namespace views 190 } // namespace views
191 191
192 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 192 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_activation_client.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698