[mac] Implement dragging of multiple tabs.

chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 766 matching lines @@
       continue;
     } else if ([current view] == view) {
       return index;
     }
     ++index;
     ++i;
   }
   return -1;
 }
 
+- (NSArray*)selectedViews {

[Robert Sesek, 2014/02/24 15:25:20]

Header order should match declaration order.

[Andre, 2014/02/25 01:16:16]

Done.

[Robert Sesek, 2014/02/25 21:06:47]

Not yet. The order of the methods in the .h should match the .mm, which still
isn't true. Although this file is not really great about doing that, apparently,
so maybe just drop this comment.

+  NSMutableArray* views = [NSMutableArray arrayWithCapacity:[tabArray_ count]];
+  for (TabController* tab in tabArray_.get()) {
+    if ([tab selected])
+      [views addObject:[tab tabView]];
+  }
+  return views;
+}
 
 // Returns the view at the given index, using the array of TabControllers to
 // get the associated view. Returns nil if out of range.
 - (NSView*)viewAtIndex:(NSUInteger)index {
   if (index >= [tabArray_ count])
     return NULL;
   return [[tabArray_ objectAtIndex:index] view];
 }
 
 - (NSUInteger)viewsCount {
@@ skipping 907 matching lines @@
   [tabController setPinned:tabStripModel_->IsTabPinned(modelIndex)];
   [tabController setApp:tabStripModel_->IsAppTab(modelIndex)];
   [tabController setUrl:contents->GetURL()];
   [self updateIconsForContents:contents atIndex:modelIndex];
   // If the tab is being restored and it's pinned, the mini state is set after
   // the tab has already been rendered, so re-layout the tabstrip. In all other
   // cases, the state is set before the tab is rendered so this isn't needed.
   [self layoutTabs];
 }
 
-- (void)setFrameOfActiveTab:(NSRect)frame {
-  NSView* view = [self activeTabView];
+- (void)setFrame:(NSRect)frame ofTabView:(NSView*)view {
   NSValue* identifier = [NSValue valueWithPointer:view];
   [targetFrames_ setObject:[NSValue valueWithRect:frame]
                     forKey:identifier];
   [view setFrame:frame];
 }
 
 - (TabStripModel*)tabStripModel {
   return tabStripModel_;
 }
 
+- (NSArray*)tabViews {
+  NSMutableArray* views = [NSMutableArray arrayWithCapacity:[tabArray_ count]];
+  for (TabController* tab in tabArray_.get()) {
+    [views addObject:[tab tabView]];
+  }
+  return views;
+}
+
 - (NSView*)activeTabView {
   int activeIndex = tabStripModel_->active_index();
   // Take closing tabs into account. They can't ever be selected.
   activeIndex = [self indexFromModelIndex:activeIndex];
   return [self viewAtIndex:activeIndex];
 }
 
-// Find the model index based on the x coordinate of the placeholder. If there
-// is no placeholder, this returns the end of the tab strip. Closing tabs are
-// not considered in computing the index.
 - (int)indexOfPlaceholder {
+  // Use |tabArray_| here instead of the tab strip count in order to get the
+  // correct index when there are closing tabs to the left of the placeholder.
+  const int count = [tabArray_ count];
+
+  // No placeholder, return the end of the strip.
+  if (placeholderTab_ == nil)
+    return count;
+
   double placeholderX = placeholderFrame_.origin.x;
   int index = 0;
   int location = 0;
-  // Use |tabArray_| here instead of the tab strip count in order to get the
-  // correct index when there are closing tabs to the left of the placeholder.
-  const int count = [tabArray_ count];
   while (index < count) {
     // Ignore closing tabs for simplicity. The only drawback of this is that
     // if the placeholder is placed right before one or several contiguous
     // currently closing tabs, the associated TabController will start at the
     // end of the closing tabs.
     if ([closingControllers_ containsObject:[tabArray_ objectAtIndex:index]]) {
       index++;
       continue;
     }
     NSView* curr = [self viewAtIndex:index];
@@ skipping 25 matching lines @@
 // Drop a given WebContents at the location of the current placeholder.
 // If there is no placeholder, it will go at the end. Used when dragging from
 // another window when we don't have access to the WebContents as part of our
 // strip. |frame| is in the coordinate system of the tab strip view and
 // represents where the user dropped the new tab so it can be animated into its
 // correct location when the tab is added to the model. If the tab was pinned in
 // its previous window, setting |pinned| to YES will propagate that state to the
 // new window. Mini-tabs are either app or pinned tabs; the app state is stored
 // by the |contents|, but the |pinned| state is the caller's responsibility.
 - (void)dropWebContents:(WebContents*)contents
+                atIndex:(int)modelIndex
               withFrame:(NSRect)frame
-            asPinnedTab:(BOOL)pinned {
-  int modelIndex = [self indexOfPlaceholder];
-
+            asPinnedTab:(BOOL)pinned
+               activate:(BOOL)activate {
   // Mark that the new tab being created should start at |frame|. It will be
   // reset as soon as the tab has been positioned.
   droppedTabFrame_ = frame;
 
   // Insert it into this tab strip. We want it in the foreground and to not
   // inherit the current tab's group.
   tabStripModel_->InsertWebContentsAt(
-      modelIndex, contents,
-      TabStripModel::ADD_ACTIVE | (pinned ? TabStripModel::ADD_PINNED : 0));
+      modelIndex,
+      contents,
+      (activate ? TabStripModel::ADD_ACTIVE : 0) |

[Robert Sesek, 2014/02/24 15:25:20]

Use ADD_NONE instead of 0, like you do in the other file.

[Andre, 2014/02/25 01:16:16]

Done.

+          (pinned ? TabStripModel::ADD_PINNED : 0));
 }
 
 // Called when the tab strip view changes size. As we only registered for
 // changes on our view, we know it's only for our view. Layout w/out
 // animations since they are blocked by the resize nested runloop. We need
 // the views to adjust immediately. Neither the tabs nor their z-order are
 // changed, so we don't need to update the subviews.
 - (void)tabViewFrameChanged:(NSNotification*)info {
   [self layoutTabsWithAnimation:NO regenerateSubviews:NO];
 }
@@ skipping 414 matching lines @@
 NSView* GetSheetParentViewForWebContents(WebContents* web_contents) {
   // View hierarchy of the contents view:
   // NSView  -- switchView, same for all tabs
   // +- NSView  -- TabContentsController's view
   //    +- TabContentsViewCocoa
   //
   // Changing it? Do not forget to modify
   // -[TabStripController swapInTabAtIndex:] too.
   return [web_contents->GetView()->GetNativeView() superview];
 }