| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/wm/public/scoped_drag_drop_disabler.h" | 5 #include "ui/wm/public/scoped_drag_drop_disabler.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/drag_drop_client.h" |
| 7 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
| 8 #include "ui/wm/public/drag_drop_client.h" | |
| 9 | 9 |
| 10 namespace aura { | 10 namespace aura { |
| 11 namespace client { | 11 namespace client { |
| 12 | 12 |
| 13 class NopDragDropClient : public DragDropClient { | 13 class NopDragDropClient : public DragDropClient { |
| 14 public: | 14 public: |
| 15 ~NopDragDropClient() override {} | 15 ~NopDragDropClient() override {} |
| 16 int StartDragAndDrop(const ui::OSExchangeData& data, | 16 int StartDragAndDrop(const ui::OSExchangeData& data, |
| 17 aura::Window* root_window, | 17 aura::Window* root_window, |
| 18 aura::Window* source_window, | 18 aura::Window* source_window, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 46 } | 46 } |
| 47 | 47 |
| 48 void ScopedDragDropDisabler::OnWindowDestroyed(Window* window) { | 48 void ScopedDragDropDisabler::OnWindowDestroyed(Window* window) { |
| 49 CHECK_EQ(window_, window); | 49 CHECK_EQ(window_, window); |
| 50 window_ = NULL; | 50 window_ = NULL; |
| 51 new_client_.reset(); | 51 new_client_.reset(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace client | 54 } // namespace client |
| 55 } // namespace aura | 55 } // namespace aura |
| OLD | NEW |