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

Side by Side Diff: ui/aura_shell/drag_drop_controller.h

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, review Created 9 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) 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 UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_ 5 #ifndef UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_
6 #define UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_ 6 #define UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/aura_shell/aura_shell_export.h" 9 #include "ui/aura_shell/aura_shell_export.h"
10 #include "ui/aura/client/drag_drop_client.h" 10 #include "ui/aura/client/drag_drop_client.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 virtual void DragUpdate(aura::Window* target, 44 virtual void DragUpdate(aura::Window* target,
45 const aura::MouseEvent& event) OVERRIDE; 45 const aura::MouseEvent& event) OVERRIDE;
46 virtual void Drop(aura::Window* target, 46 virtual void Drop(aura::Window* target,
47 const aura::MouseEvent& event) OVERRIDE; 47 const aura::MouseEvent& event) OVERRIDE;
48 virtual void DragCancel() OVERRIDE; 48 virtual void DragCancel() OVERRIDE;
49 virtual bool IsDragDropInProgress() OVERRIDE; 49 virtual bool IsDragDropInProgress() OVERRIDE;
50 50
51 // Overridden from aura::EventFilter: 51 // Overridden from aura::EventFilter:
52 virtual bool PreHandleKeyEvent(aura::Window* target, 52 virtual bool PreHandleKeyEvent(aura::Window* target,
53 aura::KeyEvent* event) OVERRIDE; 53 aura::KeyEvent* event) OVERRIDE;
54 virtual bool PreHandleTranslatedKeyEvent(
55 aura::Window* target,
56 aura::TranslatedKeyEvent* event) OVERRIDE;
54 virtual bool PreHandleMouseEvent(aura::Window* target, 57 virtual bool PreHandleMouseEvent(aura::Window* target,
55 aura::MouseEvent* event) OVERRIDE; 58 aura::MouseEvent* event) OVERRIDE;
56 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 59 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
57 aura::TouchEvent* event) OVERRIDE; 60 aura::TouchEvent* event) OVERRIDE;
58 61
59 private: 62 private:
60 friend class aura_shell::test::DragDropControllerTest; 63 friend class aura_shell::test::DragDropControllerTest;
61 64
62 // Helper method to reset everything. 65 // Helper method to reset everything.
63 void Cleanup(); 66 void Cleanup();
64 67
65 scoped_ptr<DragImageView> drag_image_; 68 scoped_ptr<DragImageView> drag_image_;
66 const ui::OSExchangeData* drag_data_; 69 const ui::OSExchangeData* drag_data_;
67 int drag_operation_; 70 int drag_operation_;
68 aura::Window* dragged_window_; 71 aura::Window* dragged_window_;
69 72
70 bool drag_drop_in_progress_; 73 bool drag_drop_in_progress_;
71 74
72 // Indicates whether the caller should be blocked on a drag/drop session. 75 // Indicates whether the caller should be blocked on a drag/drop session.
73 // Only be used for tests. 76 // Only be used for tests.
74 bool should_block_during_drag_drop_; 77 bool should_block_during_drag_drop_;
75 78
76 DISALLOW_COPY_AND_ASSIGN(DragDropController); 79 DISALLOW_COPY_AND_ASSIGN(DragDropController);
77 }; 80 };
78 81
79 } // namespace internal 82 } // namespace internal
80 } // namespace aura_shell 83 } // namespace aura_shell
81 84
82 #endif // UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_ 85 #endif // UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698