diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:03:02 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 20:03:02 +0000 |
| commit | 828a6dfa99115fec7ea4d90be55bfe025f01703c (patch) | |
| tree | 569614bc8079402dcc09abaf4d9da09bcc75d4c6 /ash/drag_drop/drag_drop_controller.cc | |
| parent | 8abc33d10c75de1902f6f59b704237f92afad0ee (diff) | |
| download | chromium_src-828a6dfa99115fec7ea4d90be55bfe025f01703c.zip chromium_src-828a6dfa99115fec7ea4d90be55bfe025f01703c.tar.gz chromium_src-828a6dfa99115fec7ea4d90be55bfe025f01703c.tar.bz2 | |
Fixes drag and drop crash. The problem was when I made
MenuController::SetExitType do a QuitNow it would prematurely exit out
of drag and drop, causing a crash. The fix is to not QuitNow if drag
and drop is on going. (Have I mentioned I hate nested message loops?).
I also changed DragDropController to QuitNow, this way tests can work
and seems like what we want anyway.
Lastly I made all the bookmarkbarviewtests work again as they provide
coverage of this.
BUG=127348
TEST=covered by tests
R=ben@chromium.org,varunjain@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10388056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 09e0aad..5a3f7df 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -149,7 +149,7 @@ void DragDropController::Drop(aura::Window* target, Cleanup(); if (should_block_during_drag_drop_) - MessageLoop::current()->Quit(); + MessageLoop::current()->QuitNow(); } void DragDropController::DragCancel() { @@ -167,7 +167,7 @@ void DragDropController::DragCancel() { drag_operation_ = 0; StartCanceledAnimation(); if (should_block_during_drag_drop_) - MessageLoop::current()->Quit(); + MessageLoop::current()->QuitNow(); } bool DragDropController::IsDragDropInProgress() { |