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

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

Issue 10388056: Fixes drag and drop crash. The problem was when I made (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « 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 #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"
(...skipping 21 matching lines...) Expand all
32 32
33 namespace internal { 33 namespace internal {
34 34
35 class DragImageView; 35 class DragImageView;
36 36
37 class ASH_EXPORT DragDropController 37 class ASH_EXPORT DragDropController
38 : public aura::client::DragDropClient, 38 : public aura::client::DragDropClient,
39 public aura::EventFilter, 39 public aura::EventFilter,
40 public ui::ImplicitAnimationObserver, 40 public ui::ImplicitAnimationObserver,
41 public aura::WindowObserver { 41 public aura::WindowObserver {
42 public: 42 public:
43 DragDropController(); 43 DragDropController();
44 virtual ~DragDropController(); 44 virtual ~DragDropController();
45 45
46 void set_should_block_during_drag_drop(bool should_block_during_drag_drop) { 46 void set_should_block_during_drag_drop(bool should_block_during_drag_drop) {
47 should_block_during_drag_drop_ = should_block_during_drag_drop; 47 should_block_during_drag_drop_ = should_block_during_drag_drop;
48 } 48 }
49 49
50 // Overridden from aura::client::DragDropClient: 50 // Overridden from aura::client::DragDropClient:
51 virtual int StartDragAndDrop(const ui::OSExchangeData& data, 51 virtual int StartDragAndDrop(const ui::OSExchangeData& data,
52 const gfx::Point& root_location, 52 const gfx::Point& root_location,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // Only be used for tests. 99 // Only be used for tests.
100 bool should_block_during_drag_drop_; 100 bool should_block_during_drag_drop_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(DragDropController); 102 DISALLOW_COPY_AND_ASSIGN(DragDropController);
103 }; 103 };
104 104
105 } // namespace internal 105 } // namespace internal
106 } // namespace ash 106 } // namespace ash
107 107
108 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 108 #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