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

Side by Side Diff: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h

Issue 276163002: Revert of Avoids releasing capture in EndMoveLoop if capture was switched to another window while .. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « no previous file | ui/views/widget/desktop_aura/x11_whole_screen_move_loop.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_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 "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // cursor wherever it goes on screen during a drag, since normal windows 84 // cursor wherever it goes on screen during a drag, since normal windows
85 // don't receive pointer motion events outside of their bounds. 85 // don't receive pointer motion events outside of their bounds.
86 ::Window grab_input_window_; 86 ::Window grab_input_window_;
87 87
88 base::Closure quit_closure_; 88 base::Closure quit_closure_;
89 89
90 // Keeps track of whether the move-loop is cancled by the user (e.g. by 90 // Keeps track of whether the move-loop is cancled by the user (e.g. by
91 // pressing escape). 91 // pressing escape).
92 bool canceled_; 92 bool canceled_;
93 93
94 // Keeps track of whether we still have a pointer grab at the end of the loop.
95 bool has_grab_;
96
97 // A Widget is created during the drag if there is an image available to be 94 // A Widget is created during the drag if there is an image available to be
98 // used during the drag. 95 // used during the drag.
99 scoped_ptr<Widget> drag_widget_; 96 scoped_ptr<Widget> drag_widget_;
100 gfx::ImageSkia drag_image_; 97 gfx::ImageSkia drag_image_;
101 gfx::Vector2dF drag_offset_; 98 gfx::Vector2dF drag_offset_;
102 XMotionEvent last_xmotion_; 99 XMotionEvent last_xmotion_;
103 base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_; 100 base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_;
104 101
105 DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop); 102 DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop);
106 }; 103 };
107 104
108 } // namespace views 105 } // namespace views
109 106
110 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 107 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/x11_whole_screen_move_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698