OLD | NEW |
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 #include "ash/drag_drop/drag_drop_controller.h" | 5 #include "ash/drag_drop/drag_drop_controller.h" |
6 | 6 |
7 #include "ash/drag_drop/drag_drop_tracker.h" | 7 #include "ash/drag_drop/drag_drop_tracker.h" |
8 #include "ash/drag_drop/drag_image_view.h" | 8 #include "ash/drag_drop/drag_image_view.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/wm/coordinate_conversion.h" | 10 #include "ash/wm/coordinate_conversion.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 virtual gfx::Size GetMinimumSize() const OVERRIDE { | 85 virtual gfx::Size GetMinimumSize() const OVERRIDE { |
86 return gfx::Size(); | 86 return gfx::Size(); |
87 } | 87 } |
88 | 88 |
89 virtual gfx::Size GetMaximumSize() const OVERRIDE { | 89 virtual gfx::Size GetMaximumSize() const OVERRIDE { |
90 return gfx::Size(); | 90 return gfx::Size(); |
91 } | 91 } |
92 | 92 |
93 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 93 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
94 const gfx::Rect& new_bounds) OVERRIDE {} | 94 const gfx::Rect& new_bounds) OVERRIDE {} |
| 95 virtual void OnPropertyChanged(const void* key, intptr_t old) OVERRIDE {} |
95 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { | 96 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { |
96 return gfx::kNullCursor; | 97 return gfx::kNullCursor; |
97 } | 98 } |
98 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { | 99 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { |
99 return HTCAPTION; | 100 return HTCAPTION; |
100 } | 101 } |
101 virtual bool ShouldDescendIntoChildForEventHandling( | 102 virtual bool ShouldDescendIntoChildForEventHandling( |
102 aura::Window* child, | 103 aura::Window* child, |
103 const gfx::Point& location) OVERRIDE { | 104 const gfx::Point& location) OVERRIDE { |
104 return true; | 105 return true; |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 if (drag_window_) | 558 if (drag_window_) |
558 drag_window_->RemoveObserver(this); | 559 drag_window_->RemoveObserver(this); |
559 drag_window_ = NULL; | 560 drag_window_ = NULL; |
560 drag_data_ = NULL; | 561 drag_data_ = NULL; |
561 // Cleanup can be called again while deleting DragDropTracker, so use Pass | 562 // Cleanup can be called again while deleting DragDropTracker, so use Pass |
562 // instead of reset to avoid double free. | 563 // instead of reset to avoid double free. |
563 drag_drop_tracker_.Pass(); | 564 drag_drop_tracker_.Pass(); |
564 } | 565 } |
565 | 566 |
566 } // namespace ash | 567 } // namespace ash |
OLD | NEW |