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

Unified Diff: ash/drag_drop/drag_drop_tracker_unittest.cc

Issue 13041002: Cancel drag upon screen lock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « ash/drag_drop/drag_drop_tracker.cc ('k') | chrome/browser/chromeos/login/webui_screen_locker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_tracker_unittest.cc
diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc
index 7113c2225678860bd196e2bf715c1a5df869c5be..acb87a46a54b78db87ea7a0f09314a9a6d125823 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;
}
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | chrome/browser/chromeos/login/webui_screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698