| 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 "ui/views/widget/widget.h" | 5 #include "ui/views/widget/widget.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 return native_widget_private()->GetHostInputMethod(); | 781 return native_widget_private()->GetHostInputMethod(); |
| 782 } | 782 } |
| 783 | 783 |
| 784 void Widget::RunShellDrag(View* view, | 784 void Widget::RunShellDrag(View* view, |
| 785 const ui::OSExchangeData& data, | 785 const ui::OSExchangeData& data, |
| 786 const gfx::Point& location, | 786 const gfx::Point& location, |
| 787 int operation, | 787 int operation, |
| 788 ui::DragDropTypes::DragEventSource source) { | 788 ui::DragDropTypes::DragEventSource source) { |
| 789 dragged_view_ = view; | 789 dragged_view_ = view; |
| 790 OnDragWillStart(); | 790 OnDragWillStart(); |
| 791 | |
| 792 WidgetDeletionObserver widget_deletion_observer(this); | |
| 793 native_widget_->RunShellDrag(view, data, location, operation, source); | 791 native_widget_->RunShellDrag(view, data, location, operation, source); |
| 794 | |
| 795 // The widget may be destroyed during the drag operation. | |
| 796 if (!widget_deletion_observer.IsWidgetAlive()) | |
| 797 return; | |
| 798 | |
| 799 // If the view is removed during the drag operation, dragged_view_ is set to | 792 // If the view is removed during the drag operation, dragged_view_ is set to |
| 800 // NULL. | 793 // NULL. |
| 801 if (view && dragged_view_ == view) { | 794 if (view && dragged_view_ == view) { |
| 802 dragged_view_ = NULL; | 795 dragged_view_ = NULL; |
| 803 view->OnDragDone(); | 796 view->OnDragDone(); |
| 804 } | 797 } |
| 805 OnDragComplete(); | 798 OnDragComplete(); |
| 806 } | 799 } |
| 807 | 800 |
| 808 void Widget::SchedulePaintInRect(const gfx::Rect& rect) { | 801 void Widget::SchedulePaintInRect(const gfx::Rect& rect) { |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1524 | 1517 |
| 1525 //////////////////////////////////////////////////////////////////////////////// | 1518 //////////////////////////////////////////////////////////////////////////////// |
| 1526 // internal::NativeWidgetPrivate, NativeWidget implementation: | 1519 // internal::NativeWidgetPrivate, NativeWidget implementation: |
| 1527 | 1520 |
| 1528 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { | 1521 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { |
| 1529 return this; | 1522 return this; |
| 1530 } | 1523 } |
| 1531 | 1524 |
| 1532 } // namespace internal | 1525 } // namespace internal |
| 1533 } // namespace views | 1526 } // namespace views |
| OLD | NEW |