Makes tab dragging on views restrict the drag to the main window....

chrome/browser/views/tabs/dragged_tab_controller.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/views/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "app/animation.h"
 #include "app/gfx/canvas.h"
@@ skipping 592 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();
 
+  // TODO(sky): make this define OS_CHROMEOS when we merge views and chromeos.
+#if defined(OS_LINUX)
+  // We don't allow detaching in chrome os.
+  TabStrip* target_tabstrip = source_tabstrip_;
+#else
   // 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.
   TabStrip* target_tabstrip = GetTabStripForPoint(screen_point);
+#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) {
     bring_to_front_timer_.Start(
@@ skipping 424 matching lines @@
     // the width of one tab until the mouse pointer (screen_point) exceeds the
     // screen bounds of the TabStrip.
     int max_x = tabstrip_bounds.right() - tab_size.width();
     int max_y = tabstrip_bounds.bottom() - tab_size.height();
     if (x > max_x && screen_point.x() <= tabstrip_bounds.right())
       x = max_x;
     if (y > max_y && screen_point.y() <=
         (tabstrip_bounds.bottom() + vertical_drag_magnetism)) {
       y = max_y;
     }
+    // TODO(sky): make this define OS_CHROMEOS when we merge views and
+    // chromeos.
+#if defined(OS_LINUX)
+    // We currently don't allow detaching on chromeos. This restricts dragging
+    // to the main window.
+    x = std::min(std::max(x, tabstrip_bounds.x()), max_x);
+    y = tabstrip_bounds.y();
+#endif
   }
   return gfx::Point(x, y);
 }
 
 
 Tab* DraggedTabController::GetTabMatchingDraggedContents(
     TabStrip* tabstrip) const {
   int index = tabstrip->model()->GetIndexOfTabContents(dragged_contents_);
   return index == TabStripModel::kNoTab ? NULL : tabstrip->GetTabAt(index);
 }
@@ skipping 314 matching lines @@
 
     // The previous call made the window appear on top of the dragged window,
     // move the dragged window to the front.
     SetWindowPos(view_->GetWidget()->GetNativeView(), HWND_TOP, 0, 0, 0, 0,
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }