From 6f637730a38de10a1173f05e48271483d27b648d Mon Sep 17 00:00:00 2001 From: "dhollowa@chromium.org" Date: Thu, 19 Jan 2012 03:15:34 +0000 Subject: Aura Shell needs to exist on Mac Adds first cut at "Aura Shell.app" on Mac. The 'ash_shell' is extended to generate a Cocoa application. This application brings up a single window containing the Aura desktop. The main view of this window provides an accelerated surface to Aura in which it can composite and draw its results. What works: - The application launches and renders the Aura desktop and background - Mouse movement, clicking, double-clicking, and interactions with Aura windows and widgets - Text buttons render with Skia text (needs improvement) - Non-modal transient window button - Window-modal window button - System-modal window button - Example Widgets button (checkboxes, radios, buttons) - Lock Screen button - Create Non-Resizable window button - Create Pointy Bubble button - Create Widow button - Switcher and Taskbar What doesn't work: - Open Views Examples Window button - Views menus - Views scrollbars - Views accelerators - Views tooltips - Drag and drop - Anything involving MessageLoop dispatcher logic - Mouse movement doesn't pass through to Aura when mouse button is up Note: Required .gyp flags are: 'use_aura': 1, 'use_webkit_compositor': 1, BUG=109946 TEST=Manual tests. R=sky@chromium.org, thakis@chromium.org Review URL: https://chromiumcodereview.appspot.com/9232028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118222 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/drag_drop/drag_drop_controller.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ash/drag_drop') diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 0f310fc..cfb12db 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -80,10 +80,13 @@ int DragDropController::StartDragAndDrop(const ui::OSExchangeData& data, dragged_window_ = NULL; drag_start_location_ = RootWindow::GetInstance()->last_mouse_location(); +#if !defined(OS_MACOSX) if (should_block_during_drag_drop_) { MessageLoopForUI::current()->RunWithDispatcher( RootWindow::GetInstance()->GetDispatcher()); } +#endif // !defined(OS_MACOSX) + return drag_operation_; } -- cgit v1.1