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 "chrome/browser/views/tabs/dragged_tab_controller.h" | 5 #include "chrome/browser/views/tabs/dragged_tab_controller.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "app/animation.h" | 10 #include "app/animation.h" |
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 | 646 |
647 TabStrip* DraggedTabController::GetTabStripForPoint( | 647 TabStrip* DraggedTabController::GetTabStripForPoint( |
648 const gfx::Point& screen_point) { | 648 const gfx::Point& screen_point) { |
649 gfx::NativeView dragged_view = view_->GetWidget()->GetNativeView(); | 649 gfx::NativeView dragged_view = view_->GetWidget()->GetNativeView(); |
650 dock_windows_.insert(dragged_view); | 650 dock_windows_.insert(dragged_view); |
651 gfx::NativeWindow local_window = | 651 gfx::NativeWindow local_window = |
652 DockInfo::GetLocalProcessWindowAtPoint(screen_point, dock_windows_); | 652 DockInfo::GetLocalProcessWindowAtPoint(screen_point, dock_windows_); |
653 dock_windows_.erase(dragged_view); | 653 dock_windows_.erase(dragged_view); |
654 if (!local_window) | 654 if (!local_window) |
655 return NULL; | 655 return NULL; |
656 BrowserView* browser = BrowserView::GetBrowserViewForNativeView(local_window); | 656 BrowserView* browser = |
| 657 BrowserView::GetBrowserViewForNativeWindow(local_window); |
657 if (!browser) | 658 if (!browser) |
658 return NULL; | 659 return NULL; |
659 | 660 |
660 TabStrip* other_tabstrip = browser->tabstrip(); | 661 TabStrip* other_tabstrip = browser->tabstrip(); |
661 if (!other_tabstrip->IsCompatibleWith(source_tabstrip_)) | 662 if (!other_tabstrip->IsCompatibleWith(source_tabstrip_)) |
662 return NULL; | 663 return NULL; |
663 return GetTabStripIfItContains(other_tabstrip, screen_point); | 664 return GetTabStripIfItContains(other_tabstrip, screen_point); |
664 } | 665 } |
665 | 666 |
666 TabStrip* DraggedTabController::GetTabStripIfItContains( | 667 TabStrip* DraggedTabController::GetTabStripIfItContains( |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1187 | 1188 |
1188 // The previous call made the window appear on top of the dragged window, | 1189 // The previous call made the window appear on top of the dragged window, |
1189 // move the dragged window to the front. | 1190 // move the dragged window to the front. |
1190 SetWindowPos(view_->GetWidget()->GetNativeView(), HWND_TOP, 0, 0, 0, 0, | 1191 SetWindowPos(view_->GetWidget()->GetNativeView(), HWND_TOP, 0, 0, 0, 0, |
1191 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); | 1192 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); |
1192 #else | 1193 #else |
1193 NOTIMPLEMENTED(); | 1194 NOTIMPLEMENTED(); |
1194 #endif | 1195 #endif |
1195 } | 1196 } |
1196 } | 1197 } |
OLD | NEW |