| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/gtk/tabs/dragged_tab_controller_gtk.h" | 5 #include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "chrome/browser/gtk/browser_window_gtk.h" | |
| 11 #include "chrome/browser/gtk/gtk_util.h" | |
| 12 #include "chrome/browser/gtk/tabs/dragged_tab_gtk.h" | |
| 13 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | |
| 14 #include "chrome/browser/platform_util.h" | 10 #include "chrome/browser/platform_util.h" |
| 15 #include "chrome/browser/tab_contents/tab_contents.h" | 11 #include "chrome/browser/tab_contents/tab_contents.h" |
| 16 #include "chrome/browser/tabs/tab_strip_model.h" | 12 #include "chrome/browser/tabs/tab_strip_model.h" |
| 17 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 15 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 16 #include "chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h" |
| 17 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
| 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 19 #include "chrome/common/notification_source.h" | 19 #include "chrome/common/notification_source.h" |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 // Delay, in ms, during dragging before we bring a window to front. | 23 // Delay, in ms, during dragging before we bring a window to front. |
| 24 const int kBringToFrontDelay = 750; | 24 const int kBringToFrontDelay = 750; |
| 25 | 25 |
| 26 // Used to determine how far a tab must obscure another tab in order to swap | 26 // Used to determine how far a tab must obscure another tab in order to swap |
| 27 // their indexes. | 27 // their indexes. |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 gfx::NativeView dragged_tab = dragged_tab_->widget(); | 781 gfx::NativeView dragged_tab = dragged_tab_->widget(); |
| 782 dock_windows_.insert(dragged_tab); | 782 dock_windows_.insert(dragged_tab); |
| 783 window = DockInfo::GetLocalProcessWindowAtPoint(GetCursorScreenPoint(), | 783 window = DockInfo::GetLocalProcessWindowAtPoint(GetCursorScreenPoint(), |
| 784 dock_windows_); | 784 dock_windows_); |
| 785 dock_windows_.erase(dragged_tab); | 785 dock_windows_.erase(dragged_tab); |
| 786 } | 786 } |
| 787 | 787 |
| 788 if (window) | 788 if (window) |
| 789 gtk_window_present(GTK_WINDOW(window)); | 789 gtk_window_present(GTK_WINDOW(window)); |
| 790 } | 790 } |
| OLD | NEW |