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

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

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 12 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura/client/drag_drop_client.h" 10 #include "ui/aura/client/drag_drop_client.h"
11 #include "ui/aura/event.h" 11 #include "ui/aura/event.h"
12 #include "ui/aura/event_filter.h" 12 #include "ui/aura/event_filter.h"
13 #include "ui/base/dragdrop/os_exchange_data.h" 13 #include "ui/base/dragdrop/os_exchange_data.h"
14 #include "ui/base/events.h" 14 #include "ui/base/events.h"
15 #include "ui/gfx/point.h" 15 #include "ui/gfx/point.h"
16 16
17 namespace aura { 17 namespace aura {
18 class Window; 18 class Window;
19 } 19 }
20 20
21 namespace aura_shell { 21 namespace ash {
22 22
23 namespace test { 23 namespace test {
24 class DragDropControllerTest; 24 class DragDropControllerTest;
25 } 25 }
26 26
27 namespace internal { 27 namespace internal {
28 28
29 class DragImageView; 29 class DragImageView;
30 30
31 class ASH_EXPORT DragDropController 31 class ASH_EXPORT DragDropController
(...skipping 19 matching lines...) Expand all
51 51
52 // Overridden from aura::EventFilter: 52 // Overridden from aura::EventFilter:
53 virtual bool PreHandleKeyEvent(aura::Window* target, 53 virtual bool PreHandleKeyEvent(aura::Window* target,
54 aura::KeyEvent* event) OVERRIDE; 54 aura::KeyEvent* event) OVERRIDE;
55 virtual bool PreHandleMouseEvent(aura::Window* target, 55 virtual bool PreHandleMouseEvent(aura::Window* target,
56 aura::MouseEvent* event) OVERRIDE; 56 aura::MouseEvent* event) OVERRIDE;
57 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 57 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
58 aura::TouchEvent* event) OVERRIDE; 58 aura::TouchEvent* event) OVERRIDE;
59 59
60 private: 60 private:
61 friend class aura_shell::test::DragDropControllerTest; 61 friend class ash::test::DragDropControllerTest;
62 62
63 // Helper method to reset everything. 63 // Helper method to reset everything.
64 void Cleanup(); 64 void Cleanup();
65 65
66 scoped_ptr<DragImageView> drag_image_; 66 scoped_ptr<DragImageView> drag_image_;
67 const ui::OSExchangeData* drag_data_; 67 const ui::OSExchangeData* drag_data_;
68 int drag_operation_; 68 int drag_operation_;
69 aura::Window* dragged_window_; 69 aura::Window* dragged_window_;
70 70
71 bool drag_drop_in_progress_; 71 bool drag_drop_in_progress_;
72 72
73 // Indicates whether the caller should be blocked on a drag/drop session. 73 // Indicates whether the caller should be blocked on a drag/drop session.
74 // Only be used for tests. 74 // Only be used for tests.
75 bool should_block_during_drag_drop_; 75 bool should_block_during_drag_drop_;
76 76
77 DISALLOW_COPY_AND_ASSIGN(DragDropController); 77 DISALLOW_COPY_AND_ASSIGN(DragDropController);
78 }; 78 };
79 79
80 } // namespace internal 80 } // namespace internal
81 } // namespace aura_shell 81 } // namespace ash
82 82
83 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 83 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698