diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 00:55:17 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 00:55:17 +0000 |
| commit | 3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5 (patch) | |
| tree | c03c94e0bd83fffccc4806315faa081be8173b0b /ash/drag_drop/drag_drop_tracker_unittest.cc | |
| parent | bb54e63c4ecd10ea4379386cc2bdc540f76a6907 (diff) | |
| download | chromium_src-3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5.zip chromium_src-3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5.tar.gz chromium_src-3f94b49b9a6422e91b4c1087d389bcff9fe9f0b5.tar.bz2 | |
Cancel drag upon screen lock.
I believe cancel upon capture lost is necessary regardless.
BUG=175486
TEST=covered by tests, manually on lock screen.
Review URL: https://codereview.chromium.org/13041002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_tracker_unittest.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_tracker_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc index 7113c22..acb87a4 100644 --- a/ash/drag_drop/drag_drop_tracker_unittest.cc +++ b/ash/drag_drop/drag_drop_tracker_unittest.cc @@ -32,7 +32,8 @@ class DragDropTrackerTest : public test::AshTestBase { static aura::Window* GetTarget(const gfx::Point& location) { scoped_ptr<internal::DragDropTracker> tracker( - new internal::DragDropTracker(Shell::GetPrimaryRootWindow())); + new internal::DragDropTracker(Shell::GetPrimaryRootWindow(), + NULL)); ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, location, location, @@ -44,7 +45,8 @@ class DragDropTrackerTest : public test::AshTestBase { static ui::LocatedEvent* ConvertEvent(aura::Window* target, const ui::MouseEvent& event) { scoped_ptr<internal::DragDropTracker> tracker( - new internal::DragDropTracker(Shell::GetPrimaryRootWindow())); + new internal::DragDropTracker(Shell::GetPrimaryRootWindow(), + NULL)); ui::LocatedEvent* converted = tracker->ConvertEvent(target, event); return converted; } |