Copies DockInfoGtk into WindowFinder.

chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tabs/dragged_view_gtk.h"
 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
+#include "chrome/browser/ui/gtk/tabs/window_finder.h"
 #include "chrome/browser/ui/media_utils.h"
+#include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/gfx/screen.h"
 
 using content::OpenURLParams;
 using content::WebContents;
@@ skipping 324 matching lines @@
 
 void DraggedTabControllerGtk::MoveDetached(const gfx::Point& screen_point) {
   DCHECK(!attached_tabstrip_);
   // Just moving the dragged view. There are no changes to the model if we're
   // detached.
   dragged_view_->MoveDetachedTo(screen_point);
 }
 
 TabStripGtk* DraggedTabControllerGtk::GetTabStripForPoint(
     const gfx::Point& screen_point) {
-  GtkWidget* dragged_window = dragged_view_->widget();
-  dock_windows_.insert(dragged_window);
-  gfx::NativeWindow local_window =
-      DockInfo::GetLocalProcessWindowAtPoint(
-          chrome::HOST_DESKTOP_TYPE_NATIVE, screen_point, dock_windows_);
-  dock_windows_.erase(dragged_window);
+  gfx::NativeWindow local_window = GetLocalProcessWindow(screen_point);
   if (!local_window)
     return NULL;
 
   BrowserWindowGtk* browser =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(local_window);
   if (!browser)
     return NULL;
 
   TabStripGtk* other_tabstrip = browser->tabstrip();
   if (!other_tabstrip->IsCompatibleWith(source_tabstrip_))
@@ skipping 390 matching lines @@
     std::vector<TabStripModelDelegate::NewStripContents> contentses;
     for (size_t i = 0; i < drag_data_->size(); ++i) {
       TabStripModelDelegate::NewStripContents item;
       item.web_contents = drag_data_->get(i)->contents_;
       item.add_types = drag_data_->GetAddTypesForDraggedTabAt(i);
       contentses.push_back(item);
     };
 
     Browser* new_browser =
         source_tabstrip_->model()->delegate()->CreateNewStripWithContents(
-            contentses, window_bounds, dock_info_, window->IsMaximized());
+            contentses, window_bounds, DockInfo(), window->IsMaximized());
     RestoreSelection(new_browser->tab_strip_model());
     new_browser->window()->Show();
     CleanUpHiddenFrame();
   }
 
   return destroy_immediately;
 }
 
 void DraggedTabControllerGtk::ResetDelegates() {
   for (size_t i = 0; i < drag_data_->size(); ++i) {
@@ skipping 75 matching lines @@
     SetDraggedTabsVisible(true, true);
 
   CleanUpHiddenFrame();
 
   if (!in_destructor_)
     source_tabstrip_->DestroyDragController();
 }
 
 void DraggedTabControllerGtk::BringWindowUnderMouseToFront() {
   // If we're going to dock to another window, bring it to the front.
-  gfx::NativeWindow window = dock_info_.window();
-  if (!window) {
-    gfx::NativeView dragged_tab = dragged_view_->widget();
-    dock_windows_.insert(dragged_tab);
-    window = DockInfo::GetLocalProcessWindowAtPoint(
-        chrome::HOST_DESKTOP_TYPE_NATIVE,
-        gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(),
-        dock_windows_);
-    dock_windows_.erase(dragged_tab);
-  }
-
+  gfx::NativeWindow window = GetLocalProcessWindow(
+      gfx::Screen::GetNativeScreen()->GetCursorScreenPoint());
   if (window)
     gtk_window_present(GTK_WINDOW(window));
 }
 
 bool DraggedTabControllerGtk::AreTabsConsecutive() {
   for (size_t i = 1; i < drag_data_->size(); ++i) {
     if (drag_data_->get(i - 1)->source_model_index_ + 1 !=
         drag_data_->get(i)->source_model_index_) {
       return false;
     }
   }
   return true;
 }
+
+gfx::NativeWindow DraggedTabControllerGtk::GetLocalProcessWindow(
+    const gfx::Point& screen_point) {
+  std::set<GtkWidget*> dragged_window;
+  dragged_window.insert(dragged_view_->widget());
+  return GetLocalProcessWindowAtPoint(
+      gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(),
+      dragged_window);
+
+}