Converts usage of GetBrowserViewForNativeWindow to

chrome/browser/ui/views/tabs/dragged_tab_controller.cc

 // Copyright (c) 2011 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/views/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 631 matching lines @@
   // think we could just convert them to screen coordinates, however in the
   // situation where we're dragging the last tab in a window when multiple
   // windows are open, the coordinates of |source_tab_| are way off in
   // hyperspace since the window was moved there instead of being closed so
   // that we'd keep receiving events. And our ConvertPointToScreen methods
   // aren't really multi-screen aware. So really it's just safer to get the
   // actual position of the mouse cursor directly from Windows here, which is
   // guaranteed to be correct regardless of monitor config.
   gfx::Point screen_point = GetCursorScreenPoint();
 
-#if defined(OS_LINUX)
-  // We don't allow detaching in chrome os.
-  BaseTabStrip* target_tabstrip = source_tabstrip_;
-#else
+#if defined(OS_WIN) && !defined(USE_AURA)
+  // Currently only allowed on windows (and not aura).
   // Determine whether or not we have dragged over a compatible TabStrip in
   // another browser window. If we have, we should attach to it and start
   // dragging within it.
   BaseTabStrip* target_tabstrip = GetTabStripForPoint(screen_point);
+#else
+  BaseTabStrip* target_tabstrip = source_tabstrip_;
 #endif
   if (target_tabstrip != attached_tabstrip_) {
     // Make sure we're fully detached from whatever TabStrip we're attached to
     // (if any).
     if (attached_tabstrip_)
       Detach();
     if (target_tabstrip)
       Attach(target_tabstrip, screen_point);
   }
   if (!target_tabstrip) {
@@ skipping 97 matching lines @@
     return dock_info_;
   }
 
   gfx::NativeView dragged_hwnd = view_->GetWidget()->GetNativeView();
   dock_windows_.insert(dragged_hwnd);
   DockInfo info = DockInfo::GetDockInfoAtPoint(screen_point, dock_windows_);
   dock_windows_.erase(dragged_hwnd);
   return info;
 }
 
+#if defined(OS_WIN) && !defined(USE_AURA)
 BaseTabStrip* DraggedTabController::GetTabStripForPoint(
     const gfx::Point& screen_point) {
   gfx::NativeView dragged_view = NULL;
   if (view_.get()) {
     dragged_view = view_->GetWidget()->GetNativeView();
     dock_windows_.insert(dragged_view);
   }
   gfx::NativeWindow local_window =
       DockInfo::GetLocalProcessWindowAtPoint(screen_point, dock_windows_);
   if (dragged_view)
     dock_windows_.erase(dragged_view);
   if (!local_window)
     return NULL;
   BrowserView* browser =
       BrowserView::GetBrowserViewForNativeWindow(local_window);
   // We don't allow drops on windows that don't have tabstrips.
   if (!browser ||
       !browser->browser()->SupportsWindowFeature(Browser::FEATURE_TABSTRIP))
     return NULL;
 
   // This cast seems ugly, but the controller and the view are tighly coupled at
   // creation time, so it will be okay.
   BaseTabStrip* other_tabstrip =
       static_cast<BaseTabStrip*>(browser->tabstrip());
 
   if (!other_tabstrip->controller()->IsCompatibleWith(source_tabstrip_))
     return NULL;
   return GetTabStripIfItContains(other_tabstrip, screen_point);
 }
+#endif
 
 BaseTabStrip* DraggedTabController::GetTabStripIfItContains(
     BaseTabStrip* tabstrip,
     const gfx::Point& screen_point) const {
   static const int kVerticalDetachMagnetism = 15;
   static const int kHorizontalDetachMagnetism = 15;
   // Make sure the specified screen point is actually within the bounds of the
   // specified tabstrip...
   gfx::Rect tabstrip_bounds = GetViewScreenBounds(tabstrip);
   if (tabstrip->type() == BaseTabStrip::HORIZONTAL_TAB_STRIP) {
@@ skipping 622 matching lines @@
 
 bool DraggedTabController::AreTabsConsecutive() {
   for (size_t i = 1; i < drag_data_.size(); ++i) {
     if (drag_data_[i - 1].source_model_index + 1 !=
         drag_data_[i].source_model_index) {
       return false;
     }
   }
   return true;
 }