diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:29:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:29:19 +0000 |
| commit | 87847948aca5b7a84d60a7b7c9587a5e4278dcf7 (patch) | |
| tree | 0db4f8fa238bb4117e5b478060f9b6963ae664b4 /ash/drag_drop | |
| parent | 3222c3267f36014363d5414f8e927b7f7eb8be47 (diff) | |
| download | chromium_src-87847948aca5b7a84d60a7b7c9587a5e4278dcf7.zip chromium_src-87847948aca5b7a84d60a7b7c9587a5e4278dcf7.tar.gz chromium_src-87847948aca5b7a84d60a7b7c9587a5e4278dcf7.tar.bz2 | |
Remove mac code from aura/ash/views
BUG=275898
Review URL: https://chromiumcodereview.appspot.com/23483041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index c2df991..fec1a6c 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -224,7 +224,6 @@ int DragDropController::StartDragAndDrop( if (cancel_animation_) cancel_animation_->End(); -#if !defined(OS_MACOSX) if (should_block_during_drag_drop_) { base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher()); quit_closure_ = run_loop.QuitClosure(); @@ -232,7 +231,6 @@ int DragDropController::StartDragAndDrop( base::MessageLoop::ScopedNestableTaskAllower allow_nested(loop); run_loop.Run(); } -#endif // !defined(OS_MACOSX) if (!cancel_animation_.get() || !cancel_animation_->is_animating() || !pending_long_tap_.get()) { |