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

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

Issue 11368072: aura: Add flag to indicate if a drag session is started with touch or mouse. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 years, 1 month 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 | 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 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "ui/aura/client/drag_drop_client.h" 10 #include "ui/aura/client/drag_drop_client.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public aura::WindowObserver { 42 public aura::WindowObserver {
43 public: 43 public:
44 DragDropController(); 44 DragDropController();
45 virtual ~DragDropController(); 45 virtual ~DragDropController();
46 46
47 void set_should_block_during_drag_drop(bool should_block_during_drag_drop) { 47 void set_should_block_during_drag_drop(bool should_block_during_drag_drop) {
48 should_block_during_drag_drop_ = should_block_during_drag_drop; 48 should_block_during_drag_drop_ = should_block_during_drag_drop;
49 } 49 }
50 50
51 // Overridden from aura::client::DragDropClient: 51 // Overridden from aura::client::DragDropClient:
52 virtual int StartDragAndDrop(const ui::OSExchangeData& data, 52 virtual int StartDragAndDrop(
53 aura::RootWindow* root_window, 53 const ui::OSExchangeData& data,
54 const gfx::Point& root_location, 54 aura::RootWindow* root_window,
55 int operation) OVERRIDE; 55 aura::Window* source_window,
56 const gfx::Point& root_location,
57 int operation,
58 ui::DragDropTypes::DragEventSource source) OVERRIDE;
56 virtual void DragUpdate(aura::Window* target, 59 virtual void DragUpdate(aura::Window* target,
57 const ui::LocatedEvent& event) OVERRIDE; 60 const ui::LocatedEvent& event) OVERRIDE;
58 virtual void Drop(aura::Window* target, 61 virtual void Drop(aura::Window* target,
59 const ui::LocatedEvent& event) OVERRIDE; 62 const ui::LocatedEvent& event) OVERRIDE;
60 virtual void DragCancel() OVERRIDE; 63 virtual void DragCancel() OVERRIDE;
61 virtual bool IsDragDropInProgress() OVERRIDE; 64 virtual bool IsDragDropInProgress() OVERRIDE;
62 65
63 // Overridden from aura::EventFilter: 66 // Overridden from aura::EventFilter:
64 virtual bool PreHandleKeyEvent(aura::Window* target, 67 virtual bool PreHandleKeyEvent(aura::Window* target,
65 ui::KeyEvent* event) OVERRIDE; 68 ui::KeyEvent* event) OVERRIDE;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 108
106 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_; 109 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_;
107 110
108 DISALLOW_COPY_AND_ASSIGN(DragDropController); 111 DISALLOW_COPY_AND_ASSIGN(DragDropController);
109 }; 112 };
110 113
111 } // namespace internal 114 } // namespace internal
112 } // namespace ash 115 } // namespace ash
113 116
114 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 117 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698