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

Side by Side Diff: ash/drag_drop/drag_drop_controller.h

Issue 10479018: Add base::RunLoop and update ui_test_utils to use it to reduce flakiness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: phajdan feedback Created 8 years, 5 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 | « ash/accelerators/nested_dispatcher_controller.cc ('k') | ash/drag_drop/drag_drop_controller.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 ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 5 #ifndef ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
6 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 6 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "base/callback.h"
10 #include "ui/aura/client/drag_drop_client.h" 11 #include "ui/aura/client/drag_drop_client.h"
11 #include "ui/aura/event.h" 12 #include "ui/aura/event.h"
12 #include "ui/aura/event_filter.h" 13 #include "ui/aura/event_filter.h"
13 #include "ui/aura/window_observer.h" 14 #include "ui/aura/window_observer.h"
14 #include "ui/base/dragdrop/os_exchange_data.h" 15 #include "ui/base/dragdrop/os_exchange_data.h"
15 #include "ui/base/events.h" 16 #include "ui/base/events.h"
16 #include "ui/compositor/layer_animation_observer.h" 17 #include "ui/compositor/layer_animation_observer.h"
17 #include "ui/gfx/point.h" 18 #include "ui/gfx/point.h"
18 19
19 namespace aura { 20 namespace aura {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // Window that is currently under the drag cursor. 93 // Window that is currently under the drag cursor.
93 aura::Window* drag_window_; 94 aura::Window* drag_window_;
94 gfx::Point drag_start_location_; 95 gfx::Point drag_start_location_;
95 96
96 bool drag_drop_in_progress_; 97 bool drag_drop_in_progress_;
97 98
98 // Indicates whether the caller should be blocked on a drag/drop session. 99 // Indicates whether the caller should be blocked on a drag/drop session.
99 // Only be used for tests. 100 // Only be used for tests.
100 bool should_block_during_drag_drop_; 101 bool should_block_during_drag_drop_;
101 102
103 // Closure for quitting nested message loop.
104 base::Closure quit_closure_;
105
102 DISALLOW_COPY_AND_ASSIGN(DragDropController); 106 DISALLOW_COPY_AND_ASSIGN(DragDropController);
103 }; 107 };
104 108
105 } // namespace internal 109 } // namespace internal
106 } // namespace ash 110 } // namespace ash
107 111
108 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 112 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/accelerators/nested_dispatcher_controller.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698