| 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 "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 : drag_drop_controller_(controller) {} | 80 : drag_drop_controller_(controller) {} |
| 81 ~DragDropTrackerDelegate() override {} | 81 ~DragDropTrackerDelegate() override {} |
| 82 | 82 |
| 83 // Overridden from WindowDelegate: | 83 // Overridden from WindowDelegate: |
| 84 gfx::Size GetMinimumSize() const override { return gfx::Size(); } | 84 gfx::Size GetMinimumSize() const override { return gfx::Size(); } |
| 85 | 85 |
| 86 gfx::Size GetMaximumSize() const override { return gfx::Size(); } | 86 gfx::Size GetMaximumSize() const override { return gfx::Size(); } |
| 87 | 87 |
| 88 void OnBoundsChanged(const gfx::Rect& old_bounds, | 88 void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 89 const gfx::Rect& new_bounds) override {} | 89 const gfx::Rect& new_bounds) override {} |
| 90 ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; } |
| 90 gfx::NativeCursor GetCursor(const gfx::Point& point) override { | 91 gfx::NativeCursor GetCursor(const gfx::Point& point) override { |
| 91 return gfx::kNullCursor; | 92 return gfx::kNullCursor; |
| 92 } | 93 } |
| 93 int GetNonClientComponent(const gfx::Point& point) const override { | 94 int GetNonClientComponent(const gfx::Point& point) const override { |
| 94 return HTCAPTION; | 95 return HTCAPTION; |
| 95 } | 96 } |
| 96 bool ShouldDescendIntoChildForEventHandling( | 97 bool ShouldDescendIntoChildForEventHandling( |
| 97 aura::Window* child, | 98 aura::Window* child, |
| 98 const gfx::Point& location) override { | 99 const gfx::Point& location) override { |
| 99 return true; | 100 return true; |
| (...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 if (drag_window_) | 550 if (drag_window_) |
| 550 drag_window_->RemoveObserver(this); | 551 drag_window_->RemoveObserver(this); |
| 551 drag_window_ = NULL; | 552 drag_window_ = NULL; |
| 552 drag_data_ = NULL; | 553 drag_data_ = NULL; |
| 553 // Cleanup can be called again while deleting DragDropTracker, so delete | 554 // Cleanup can be called again while deleting DragDropTracker, so delete |
| 554 // the pointer with a local variable to avoid double free. | 555 // the pointer with a local variable to avoid double free. |
| 555 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass(); | 556 scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass(); |
| 556 } | 557 } |
| 557 | 558 |
| 558 } // namespace ash | 559 } // namespace ash |
| OLD | NEW |