[stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

ui/views/drag_utils.cc

 // 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.
 
 #include "ui/views/drag_utils.h"
 
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
@@ skipping 16 matching lines @@
   return device_scale;
 }
 
 namespace views {
 
 void RunShellDrag(gfx::NativeView view,
                   const ui::OSExchangeData& data,
                   const gfx::Point& location,
                   int operation,
                   ui::DragDropTypes::DragEventSource source) {
+#if !defined(OS_MACOSX)
   gfx::Point root_location(location);
   aura::Window* root_window = view->GetRootWindow();
   aura::Window::ConvertPointToTarget(view, root_window, &root_location);
   if (aura::client::GetDragDropClient(root_window)) {
     aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
         data, root_window, view, root_location, operation, source);
   }
+#endif
 }
 
 gfx::Canvas* GetCanvasForDragImage(views::Widget* widget,
                                    const gfx::Size& canvas_size) {
   float device_scale = GetDeviceScaleForNativeView(widget);
   return new gfx::Canvas(canvas_size, device_scale, false);
 }
 
 }  // namespace views