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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/drag_drop/drag_drop_tracker.h" 5 #include "ash/drag_drop/drag_drop_tracker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 14 matching lines...) Expand all
25 aura::Window* CreateTestWindow(const gfx::Rect& bounds) { 25 aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
26 static int window_id = 0; 26 static int window_id = 0;
27 return CreateTestWindowInShellWithDelegate( 27 return CreateTestWindowInShellWithDelegate(
28 aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 28 aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(),
29 window_id++, 29 window_id++,
30 bounds); 30 bounds);
31 } 31 }
32 32
33 static aura::Window* GetTarget(const gfx::Point& location) { 33 static aura::Window* GetTarget(const gfx::Point& location) {
34 scoped_ptr<internal::DragDropTracker> tracker( 34 scoped_ptr<internal::DragDropTracker> tracker(
35 new internal::DragDropTracker(Shell::GetPrimaryRootWindow())); 35 new internal::DragDropTracker(Shell::GetPrimaryRootWindow(),
36 NULL));
36 ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, 37 ui::MouseEvent e(ui::ET_MOUSE_DRAGGED,
37 location, 38 location,
38 location, 39 location,
39 ui::EF_NONE); 40 ui::EF_NONE);
40 aura::Window* target = tracker->GetTarget(e); 41 aura::Window* target = tracker->GetTarget(e);
41 return target; 42 return target;
42 } 43 }
43 44
44 static ui::LocatedEvent* ConvertEvent(aura::Window* target, 45 static ui::LocatedEvent* ConvertEvent(aura::Window* target,
45 const ui::MouseEvent& event) { 46 const ui::MouseEvent& event) {
46 scoped_ptr<internal::DragDropTracker> tracker( 47 scoped_ptr<internal::DragDropTracker> tracker(
47 new internal::DragDropTracker(Shell::GetPrimaryRootWindow())); 48 new internal::DragDropTracker(Shell::GetPrimaryRootWindow(),
49 NULL));
48 ui::LocatedEvent* converted = tracker->ConvertEvent(target, event); 50 ui::LocatedEvent* converted = tracker->ConvertEvent(target, event);
49 return converted; 51 return converted;
50 } 52 }
51 }; 53 };
52 54
53 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports 55 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
54 // non-X11 platforms. 56 // non-X11 platforms.
55 #if defined(USE_X11) 57 #if defined(USE_X11)
56 #define MAYBE_GetTarget GetTarget 58 #define MAYBE_GetTarget GetTarget
57 #else 59 #else
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(), 193 scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(),
192 original11)); 194 original11));
193 EXPECT_EQ(original11.type(), converted11->type()); 195 EXPECT_EQ(original11.type(), converted11->type());
194 EXPECT_EQ("50,50", converted11->location().ToString()); 196 EXPECT_EQ("50,50", converted11->location().ToString());
195 EXPECT_EQ("150,150", converted11->root_location().ToString()); 197 EXPECT_EQ("150,150", converted11->root_location().ToString());
196 EXPECT_EQ(original11.flags(), converted11->flags()); 198 EXPECT_EQ(original11.flags(), converted11->flags());
197 } 199 }
198 200
199 } // namespace test 201 } // namespace test
200 } // namespace aura 202 } // namespace aura
OLDNEW
« 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