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

Side by Side Diff: ui/views/widget/x11_desktop_window_move_client.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
« no previous file with comments | « ui/views/widget/widget.cc ('k') | ui/views/widget/x11_desktop_window_move_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_ 5 #ifndef UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
6 #define UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_ 6 #define UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/aura/client/window_move_client.h" 10 #include "ui/aura/client/window_move_client.h"
(...skipping 11 matching lines...) Expand all
22 X11DesktopWindowMoveClient(); 22 X11DesktopWindowMoveClient();
23 virtual ~X11DesktopWindowMoveClient(); 23 virtual ~X11DesktopWindowMoveClient();
24 24
25 // Overridden from aura::EventFilter: 25 // Overridden from aura::EventFilter:
26 virtual bool PreHandleKeyEvent(aura::Window* target, 26 virtual bool PreHandleKeyEvent(aura::Window* target,
27 ui::KeyEvent* event) OVERRIDE; 27 ui::KeyEvent* event) OVERRIDE;
28 virtual bool PreHandleMouseEvent(aura::Window* target, 28 virtual bool PreHandleMouseEvent(aura::Window* target,
29 ui::MouseEvent* event) OVERRIDE; 29 ui::MouseEvent* event) OVERRIDE;
30 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 30 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
31 ui::TouchEvent* event) OVERRIDE; 31 ui::TouchEvent* event) OVERRIDE;
32 virtual ui::GestureStatus PreHandleGestureEvent( 32 virtual ui::EventResult PreHandleGestureEvent(
33 aura::Window* target, 33 aura::Window* target,
34 ui::GestureEvent* event) OVERRIDE; 34 ui::GestureEvent* event) OVERRIDE;
35 35
36 // Overridden from aura::client::WindowMoveClient: 36 // Overridden from aura::client::WindowMoveClient:
37 virtual void RunMoveLoop(aura::Window* window, 37 virtual void RunMoveLoop(aura::Window* window,
38 const gfx::Point& drag_offset) OVERRIDE; 38 const gfx::Point& drag_offset) OVERRIDE;
39 virtual void EndMoveLoop() OVERRIDE; 39 virtual void EndMoveLoop() OVERRIDE;
40 40
41 private: 41 private:
42 // Are we running a nested message loop from RunMoveLoop()? 42 // Are we running a nested message loop from RunMoveLoop()?
43 bool in_move_loop_; 43 bool in_move_loop_;
44 44
45 // Our cursor offset from the top left window origin when the drag 45 // Our cursor offset from the top left window origin when the drag
46 // started. Used to calculate the window's new bounds relative to the current 46 // started. Used to calculate the window's new bounds relative to the current
47 // location of the cursor. 47 // location of the cursor.
48 gfx::Point window_offset_; 48 gfx::Point window_offset_;
49 49
50 base::Closure quit_closure_; 50 base::Closure quit_closure_;
51 }; 51 };
52 52
53 } // namespace views 53 } // namespace views
54 54
55 #endif // UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_ 55 #endif // UI_VIEWS_WIDGET_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/views/widget/widget.cc ('k') | ui/views/widget/x11_desktop_window_move_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698