mac: Remove code that was only needed on 10.5

chrome/browser/ui/cocoa/tabs/tab_strip_drag_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_drag_controller.h"
 
 #import "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
@@ skipping 22 matching lines @@
 
 const CGFloat kTearDistance = 36.0;
 const NSTimeInterval kTearDuration = 0.333;
 
 @interface TabStripDragController (Private)
 - (void)resetDragControllers;
 - (NSArray*)dropTargetsForController:(TabWindowController*)dragController;
 - (void)setWindowBackgroundVisibility:(BOOL)shouldBeVisible;
 - (void)endDrag:(NSEvent*)event;
 - (void)continueDrag:(NSEvent*)event;
-// TODO(davidben): When we stop supporting 10.5, this can be removed.
-- (int)getWorkspaceID:(NSWindow*)window useCache:(BOOL)useCache;
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @implementation TabStripDragController
 
 - (id)initWithTabStripController:(TabStripController*)controller {
   if ((self = [super init])) {
     tabStrip_ = controller;
   }
@@ skipping 393 matching lines @@
 // Returns an array of controllers that could be a drop target, ordered front to
 // back. It has to be of the appropriate class, and visible (obviously). Note
 // that the window cannot be a target for itself.
 - (NSArray*)dropTargetsForController:(TabWindowController*)dragController {
   NSMutableArray* targets = [NSMutableArray array];
   NSWindow* dragWindow = [dragController window];
   for (NSWindow* window in [NSApp orderedWindows]) {
     if (window == dragWindow) continue;
     if (![window isVisible]) continue;
     // Skip windows on the wrong space.
-    if ([window respondsToSelector:@selector(isOnActiveSpace)]) {
-      if (![window performSelector:@selector(isOnActiveSpace)])
-        continue;
-    } else {
-      // TODO(davidben): When we stop supporting 10.5, this can be
-      // removed.
-      //
-      // We don't cache the workspace of |dragWindow| because it may
-      // move around spaces.
-      if ([self getWorkspaceID:dragWindow useCache:NO] !=
-          [self getWorkspaceID:window useCache:YES])
-        continue;
-    }
+    if (![window isOnActiveSpace])
+      continue;
     NSWindowController* controller = [window windowController];
     if ([controller isKindOfClass:[TabWindowController class]]) {
       TabWindowController* realController =
           static_cast<TabWindowController*>(controller);
       if ([realController canReceiveFrom:dragController])
         [targets addObject:controller];
     }
   }
   return targets;
 }
@@ skipping 17 matching lines @@
     [[draggedController_ overlayWindow] setHasShadow:YES];
     [[targetController_ window] makeMainWindow];
   } else {
     [dragWindow_ setAlphaValue:0.5];
     [[draggedController_ overlayWindow] setHasShadow:NO];
     [[draggedController_ window] makeMainWindow];
   }
   chromeIsVisible_ = shouldBeVisible;
 }
 
-// Returns the workspace id of |window|. If |useCache|, then lookup
-// and remember the value in |workspaceIDCache_| until the end of the
-// current drag.
-- (int)getWorkspaceID:(NSWindow*)window useCache:(BOOL)useCache {
-  CGWindowID windowID = [window windowNumber];
-  if (useCache) {
-    std::map<CGWindowID, int>::iterator iter =
-        workspaceIDCache_.find(windowID);

[Robert Sesek, 2012/07/20 17:59:36]

Can you delete workspaceIDCache_ too?

[Nico, 2012/07/20 18:02:13]

Done.

-    if (iter != workspaceIDCache_.end())
-      return iter->second;
-  }
-
-  int workspace = -1;
-  // It's possible to query in bulk, but probably not necessary.
-  base::mac::ScopedCFTypeRef<CFArrayRef> windowIDs(CFArrayCreate(
-      NULL, reinterpret_cast<const void **>(&windowID), 1, NULL));
-  base::mac::ScopedCFTypeRef<CFArrayRef> descriptions(
-      CGWindowListCreateDescriptionFromArray(windowIDs));
-  DCHECK(CFArrayGetCount(descriptions.get()) <= 1);
-  if (CFArrayGetCount(descriptions.get()) > 0) {
-    CFDictionaryRef dict = static_cast<CFDictionaryRef>(
-        CFArrayGetValueAtIndex(descriptions.get(), 0));
-    DCHECK(CFGetTypeID(dict) == CFDictionaryGetTypeID());
-
-    // Sanity check the ID.
-    CFNumberRef otherIDRef =
-        base::mac::GetValueFromDictionary<CFNumberRef>(dict, kCGWindowNumber);
-    CGWindowID otherID;
-    if (otherIDRef &&
-        CFNumberGetValue(otherIDRef, kCGWindowIDCFNumberType, &otherID) &&
-        otherID == windowID) {
-      // And then get the workspace.
-      CFNumberRef workspaceRef =
-          base::mac::GetValueFromDictionary<CFNumberRef>(dict,
-                                                         kCGWindowWorkspace);
-      if (!workspaceRef ||
-          !CFNumberGetValue(workspaceRef, kCFNumberIntType, &workspace)) {
-        workspace = -1;
-      }
-    } else {
-      NOTREACHED();
-    }
-  }
-  if (useCache) {
-    workspaceIDCache_[windowID] = workspace;
-  }
-  return workspace;
-}
-
 @end