Fix for delegate ordering problem dragging tabs between windows. We now remove the delegate and re-instate the new one in the correct order. Clean up the API a little as well. BUG=11466. TEST=dragging a tab into an existing window then switching tabs back and forth in the destination window.

Review URL: http://codereview.chromium.org/115240

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15864 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 7 deletions

diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index c8ce90d..8566eac 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -271,15 +271,10 @@
     // into any existing window.
     TabWindowController* dropController = targetController;
     if (dropController) {
-      // The ordering here is important. We need to be able to get from the
-      // TabView in the |draggedController| to whatever is needed by the tab
-      // model. To do so, it still has to be in the model, so we have to call
-      // "drop" before we call "detach".
       NSView* draggedTabView = [draggedController selectedTabView];
       [draggedController removeOverlay];
-      [dropController dropTabView:draggedTabView
+      [dropController moveTabView:draggedTabView
                    fromController:draggedController];
-      [draggedController detachTabView:draggedTabView];
       [dropController showWindow:nil];
     } else {
       [targetController removePlaceholder];
@@ -301,7 +296,7 @@
     if (wasDrag) {
       // Move tab to new location.
       TabWindowController* dropController = sourceController;
-      [dropController dropTabView:[dropController selectedTabView]
+      [dropController moveTabView:[dropController selectedTabView]
                    fromController:nil];
     }
   }