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

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

Issue 8682029: Make drag and drop work on webpage. Also slightly modify drag drop workflow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: modified according to comments 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
« no previous file with comments | « ui/aura/client/window_drag_drop_delegate.h ('k') | ui/aura_shell/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) 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 21 matching lines...) Expand all
32 public aura::EventFilter { 32 public aura::EventFilter {
33 public: 33 public:
34 DragDropController(); 34 DragDropController();
35 virtual ~DragDropController(); 35 virtual ~DragDropController();
36 36
37 void set_should_block_during_drag_drop(bool should_block_during_drag_drop) { 37 void set_should_block_during_drag_drop(bool should_block_during_drag_drop) {
38 should_block_during_drag_drop_ = should_block_during_drag_drop; 38 should_block_during_drag_drop_ = should_block_during_drag_drop;
39 } 39 }
40 40
41 // Overridden from aura::DragDropClient: 41 // Overridden from aura::DragDropClient:
42 virtual void StartDragAndDrop(const ui::OSExchangeData& data, 42 virtual int StartDragAndDrop(const ui::OSExchangeData& data,
43 int operation) OVERRIDE; 43 int operation) OVERRIDE;
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 50
50 // Overridden from aura::EventFilter: 51 // Overridden from aura::EventFilter:
51 virtual bool PreHandleKeyEvent(aura::Window* target, 52 virtual bool PreHandleKeyEvent(aura::Window* target,
52 aura::KeyEvent* event) OVERRIDE; 53 aura::KeyEvent* event) OVERRIDE;
53 virtual bool PreHandleMouseEvent(aura::Window* target, 54 virtual bool PreHandleMouseEvent(aura::Window* target,
54 aura::MouseEvent* event) OVERRIDE; 55 aura::MouseEvent* event) OVERRIDE;
55 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 56 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
56 aura::TouchEvent* event) OVERRIDE; 57 aura::TouchEvent* event) OVERRIDE;
57 58
58 private: 59 private:
(...skipping 13 matching lines...) Expand all
72 // Only be used for tests. 73 // Only be used for tests.
73 bool should_block_during_drag_drop_; 74 bool should_block_during_drag_drop_;
74 75
75 DISALLOW_COPY_AND_ASSIGN(DragDropController); 76 DISALLOW_COPY_AND_ASSIGN(DragDropController);
76 }; 77 };
77 78
78 } // namespace internal 79 } // namespace internal
79 } // namespace aura_shell 80 } // namespace aura_shell
80 81
81 #endif // UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_ 82 #endif // UI_AURA_SHELL_DRAG_DROP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/aura/client/window_drag_drop_delegate.h ('k') | ui/aura_shell/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698