| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <math.h> | 5 #include <math.h> |
| 6 #include <set> | 6 #include <set> |
| 7 | 7 |
| 8 #include "chrome/browser/views/tabs/dragged_tab_controller.h" | 8 #include "chrome/browser/views/tabs/dragged_tab_controller.h" |
| 9 | 9 |
| 10 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
| (...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 953 // deleting the controller it won't call us back. | 953 // deleting the controller it won't call us back. |
| 954 dock_controllers_[i]->clear_controller(); | 954 dock_controllers_[i]->clear_controller(); |
| 955 dock_controllers_[i]->Hide(); | 955 dock_controllers_[i]->Hide(); |
| 956 } | 956 } |
| 957 dock_controllers_.clear(); | 957 dock_controllers_.clear(); |
| 958 dock_windows_.clear(); | 958 dock_windows_.clear(); |
| 959 | 959 |
| 960 bool destroy_now = true; | 960 bool destroy_now = true; |
| 961 if (type != TAB_DESTROYED) { | 961 if (type != TAB_DESTROYED) { |
| 962 // We only finish up the drag if we were actually dragging. If we never | 962 // We only finish up the drag if we were actually dragging. If we never |
| 963 // constructed a view, the user just clicked and released and didn't move th
e | 963 // constructed a view, the user just clicked and released and didn't move |
| 964 // mouse enough to trigger a drag. | 964 // the mouse enough to trigger a drag. |
| 965 if (view_.get()) { | 965 if (view_.get()) { |
| 966 RestoreFocus(); | 966 RestoreFocus(); |
| 967 if (type == CANCELED) { | 967 if (type == CANCELED) { |
| 968 RevertDrag(); | 968 RevertDrag(); |
| 969 } else { | 969 } else { |
| 970 destroy_now = CompleteDrag(); | 970 destroy_now = CompleteDrag(); |
| 971 } | 971 } |
| 972 } | 972 } |
| 973 if (dragged_contents_ && dragged_contents_->delegate() == this) | 973 if (dragged_contents_ && dragged_contents_->delegate() == this) |
| 974 dragged_contents_->set_delegate(original_delegate_); | 974 dragged_contents_->set_delegate(original_delegate_); |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 // Move the window to the front. | 1224 // Move the window to the front. |
| 1225 SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, | 1225 SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, |
| 1226 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); | 1226 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); |
| 1227 | 1227 |
| 1228 // The previous call made the window appear on top of the dragged window, | 1228 // The previous call made the window appear on top of the dragged window, |
| 1229 // move the dragged window to the front. | 1229 // move the dragged window to the front. |
| 1230 SetWindowPos(view_->GetWidget()->GetHWND(), HWND_TOP, 0, 0, 0, 0, | 1230 SetWindowPos(view_->GetWidget()->GetHWND(), HWND_TOP, 0, 0, 0, 0, |
| 1231 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); | 1231 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); |
| 1232 } | 1232 } |
| 1233 } | 1233 } |
| OLD | NEW |