Revert of Fixed dragging a folder from bookmark manager to open all elements in new 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 161 matching lines @@
                 finished:(BOOL)finished;
 - (NSInteger)indexFromModelIndex:(NSInteger)index;
 - (void)clickNewTabButton:(id)sender;
 - (NSInteger)numberOfOpenTabs;
 - (NSInteger)numberOfOpenPinnedTabs;
 - (NSInteger)numberOfOpenNonPinnedTabs;
 - (void)mouseMoved:(NSEvent*)event;
 - (void)setTabTrackingAreasEnabled:(BOOL)enabled;
 - (void)droppingURLsAt:(NSPoint)point
             givesIndex:(NSInteger*)index
-           disposition:(WindowOpenDisposition*)disposition
-           activateTab:(BOOL)activateTab;
+           disposition:(WindowOpenDisposition*)disposition;
 - (void)setNewTabButtonHoverState:(BOOL)showHover;
 - (void)themeDidChangeNotification:(NSNotification*)notification;
 - (BOOL)doesAnyOtherWebContents:(content::WebContents*)selected
                  haveAlertState:(TabAlertState)state;
 @end
 
 // A simple view class that contains the traffic light buttons. This class
 // ensures that the buttons display the icons when the mouse hovers over
 // them by overriding the _mouseInGroup method.
 @interface CustomWindowControlsView : NSView {
@@ skipping 1838 matching lines @@
   [tabStripView_ setSubviews:subviews];
   [self setTabTrackingAreasEnabled:mouseInside_];
 }
 
 // Get the index and disposition for a potential URL(s) drop given a point (in
 // the |TabStripView|'s coordinates). It considers only the x-coordinate of the
 // given point. If it's in the "middle" of a tab, it drops on that tab. If it's
 // to the left, it inserts to the left, and similarly for the right.
 - (void)droppingURLsAt:(NSPoint)point
             givesIndex:(NSInteger*)index
-           disposition:(WindowOpenDisposition*)disposition
-           activateTab:(BOOL)activateTab {
+           disposition:(WindowOpenDisposition*)disposition {
   // Proportion of the tab which is considered the "middle" (and causes things
   // to drop on that tab).
   const double kMiddleProportion = 0.5;
   const double kLRProportion = (1.0 - kMiddleProportion) / 2.0;
   const CGFloat kTabOverlap = [TabStripController tabOverlap];
 
   DCHECK(index && disposition);
   NSInteger i = 0;
   BOOL isRTL = cocoa_l10n_util::ShouldDoExperimentalRTLLayout();
   for (TabController* tab in tabArray_.get()) {
@@ skipping 10 matching lines @@
     frame.size.width -= kTabOverlap;
     if (frame.size.width < 1.0)
       frame.size.width = 1.0;  // try to avoid complete failure
 
     CGFloat rightEdge = NSMaxX(frame) - kLRProportion * frame.size.width;
     CGFloat leftEdge = frame.origin.x + kLRProportion * frame.size.width;
 
     // Drop in a new tab before  tab |i|?
     if (isRTL ? point.x > rightEdge : point.x < leftEdge) {
       *index = i;
-      if (activateTab) {
-        *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
-      } else {
-        *disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
-      }
+      *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
       return;
     }
 
     // Drop on tab |i|?
     if (isRTL ? point.x >= leftEdge : point.x <= rightEdge) {
       *index = i;
       *disposition = WindowOpenDisposition::CURRENT_TAB;
       return;
     }
 
     // (Dropping in a new tab to the right of tab |i| will be taken care of in
     // the next iteration.)
     i++;
   }
 
   // If we've made it here, we want to append a new tab to the end.
   *index = -1;
-  if (activateTab) {
-    *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
-  } else {
-    *disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
-  }
+  *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
 }
 
-- (void)openURL:(GURL*)url
-         inView:(NSView*)view
-             at:(NSPoint)point
-    activateTab:(BOOL)activateTab {
+- (void)openURL:(GURL*)url inView:(NSView*)view at:(NSPoint)point {
   // Security: Block JavaScript to prevent self-XSS.
   if (url->SchemeIs(url::kJavaScriptScheme))
     return;
 
   // Get the index and disposition.
   NSInteger index;
   WindowOpenDisposition disposition;
   [self droppingURLsAt:point
             givesIndex:&index
-           disposition:&disposition
-           activateTab:activateTab];
+           disposition:&disposition];
 
   // Either insert a new tab or open in a current tab.
   switch (disposition) {
-    case WindowOpenDisposition::NEW_FOREGROUND_TAB:
-    case WindowOpenDisposition::NEW_BACKGROUND_TAB: {
+    case WindowOpenDisposition::NEW_FOREGROUND_TAB: {
       content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"));
       chrome::NavigateParams params(browser_, *url,
                                     ui::PAGE_TRANSITION_TYPED);
       params.disposition = disposition;
       params.tabstrip_index = index;
       params.tabstrip_add_types =
           TabStripModel::ADD_ACTIVE | TabStripModel::ADD_FORCE_INDEX;
       chrome::Navigate(&params);
       break;
     }
@@ skipping 12 matching lines @@
 
 // (URLDropTargetController protocol)
 - (void)dropURLs:(NSArray*)urls inView:(NSView*)view at:(NSPoint)point {
   DCHECK_EQ(view, tabStripView_.get());
 
   if ([urls count] < 1) {
     NOTREACHED();
     return;
   }
 
-  for (NSInteger index = [urls count] - 1; index >= 0; index--) {
-    // Refactor this code.
-    // https://crbug.com/665261.
-    GURL url = url_formatter::FixupURL(
-        base::SysNSStringToUTF8([urls objectAtIndex:index]), std::string());
+  //TODO(viettrungluu): dropping multiple URLs.
+  if ([urls count] > 1)
+    NOTIMPLEMENTED();
 
-    // If the URL isn't valid, don't bother.
-    if (!url.is_valid())
-      continue;
+  // Get the first URL and fix it up.
+  GURL url(GURL(url_formatter::FixupURL(
+      base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string())));
 
-    if (index == static_cast<NSInteger>([urls count]) - 1) {
-      [self openURL:&url inView:view at:point activateTab:YES];
-    } else {
-      [self openURL:&url inView:view at:point activateTab:NO];
-    }
-  }
+  // If the URL isn't valid, don't bother.
+  if (!url.is_valid())
+    return;
+
+  [self openURL:&url inView:view at:point];
 }
 
 // (URLDropTargetController protocol)
 - (void)dropText:(NSString*)text inView:(NSView*)view at:(NSPoint)point {
   DCHECK_EQ(view, tabStripView_.get());
 
   // If the input is plain text, classify the input and make the URL.
   AutocompleteMatch match;
   AutocompleteClassifierFactory::GetForProfile(browser_->profile())->Classify(
       base::SysNSStringToUTF16(text), false, false,
       metrics::OmniboxEventProto::BLANK, &match, NULL);
   GURL url(match.destination_url);
 
-  [self openURL:&url inView:view at:point activateTab:YES];
+  [self openURL:&url inView:view at:point];
 }
 
 // (URLDropTargetController protocol)
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   DCHECK_EQ(view, tabStripView_.get());
 
   // The minimum y-coordinate at which one should consider place the arrow.
   const CGFloat arrowBaseY = 25;
   const CGFloat kTabOverlap = [TabStripController tabOverlap];
 
   NSInteger index;
   WindowOpenDisposition disposition;
   [self droppingURLsAt:point
             givesIndex:&index
-           disposition:&disposition
-           activateTab:YES];
+           disposition:&disposition];
 
   NSPoint arrowPos = NSMakePoint(0, arrowBaseY);
   if (index == -1) {
     // Append a tab at the end.
     DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB);
     NSInteger lastIndex = [tabArray_ count] - 1;
     NSRect overRect = [[[tabArray_ objectAtIndex:lastIndex] view] frame];
     arrowPos.x = overRect.origin.x + overRect.size.width - kTabOverlap / 2.0;
   } else {
     NSRect overRect = [[[tabArray_ objectAtIndex:index] view] frame];
@@ skipping 189 matching lines @@
   for (int i = 0; i < tabStripModel_->count(); i++) {
     [self updateIconsForContents:tabStripModel_->GetWebContentsAt(i) atIndex:i];
   }
 }
 
 - (void)setVisualEffectsDisabledForFullscreen:(BOOL)fullscreen {
   [tabStripView_ setVisualEffectsDisabledForFullscreen:fullscreen];
 }
 
 @end