Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: ui/views/drag_utils.cc

Issue 231883003: [stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/textfield/textfield.cc ('k') | ui/views/metrics_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/drag_utils.cc
diff --git a/ui/views/drag_utils.cc b/ui/views/drag_utils.cc
index 840d75febd9e7d47ed9e86772b1041dcc1f1cf15..87fa42bc631f7c96024b77cfa3af0f233ee23196 100644
--- a/ui/views/drag_utils.cc
+++ b/ui/views/drag_utils.cc
@@ -34,6 +34,7 @@ void RunShellDrag(gfx::NativeView view,
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);
@@ -41,6 +42,7 @@ void RunShellDrag(gfx::NativeView view,
aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
data, root_window, view, root_location, operation, source);
}
+#endif
}
gfx::Canvas* GetCanvasForDragImage(views::Widget* widget,
« no previous file with comments | « ui/views/controls/textfield/textfield.cc ('k') | ui/views/metrics_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698