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

Side by Side Diff: ash/drag_drop/drag_drop_tracker_unittest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/drag_drop/drag_image_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13 matching lines...) Expand all
24 24
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<DragDropTracker> tracker(
35 new internal::DragDropTracker(Shell::GetPrimaryRootWindow(), 35 new DragDropTracker(Shell::GetPrimaryRootWindow(), NULL));
36 NULL));
37 ui::MouseEvent e(ui::ET_MOUSE_DRAGGED, 36 ui::MouseEvent e(ui::ET_MOUSE_DRAGGED,
38 location, 37 location,
39 location, 38 location,
40 ui::EF_NONE, 39 ui::EF_NONE,
41 ui::EF_NONE); 40 ui::EF_NONE);
42 aura::Window* target = tracker->GetTarget(e); 41 aura::Window* target = tracker->GetTarget(e);
43 return target; 42 return target;
44 } 43 }
45 44
46 static ui::LocatedEvent* ConvertEvent(aura::Window* target, 45 static ui::LocatedEvent* ConvertEvent(aura::Window* target,
47 const ui::MouseEvent& event) { 46 const ui::MouseEvent& event) {
48 scoped_ptr<internal::DragDropTracker> tracker( 47 scoped_ptr<DragDropTracker> tracker(
49 new internal::DragDropTracker(Shell::GetPrimaryRootWindow(), 48 new DragDropTracker(Shell::GetPrimaryRootWindow(), NULL));
50 NULL));
51 ui::LocatedEvent* converted = tracker->ConvertEvent(target, event); 49 ui::LocatedEvent* converted = tracker->ConvertEvent(target, event);
52 return converted; 50 return converted;
53 } 51 }
54 }; 52 };
55 53
56 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports 54 // TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
57 // non-X11 platforms. 55 // non-X11 platforms.
58 #if defined(USE_X11) 56 #if defined(USE_X11)
59 #define MAYBE_GetTarget GetTarget 57 #define MAYBE_GetTarget GetTarget
60 #else 58 #else
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(), 196 scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(),
199 original11)); 197 original11));
200 EXPECT_EQ(original11.type(), converted11->type()); 198 EXPECT_EQ(original11.type(), converted11->type());
201 EXPECT_EQ("50,50", converted11->location().ToString()); 199 EXPECT_EQ("50,50", converted11->location().ToString());
202 EXPECT_EQ("150,150", converted11->root_location().ToString()); 200 EXPECT_EQ("150,150", converted11->root_location().ToString());
203 EXPECT_EQ(original11.flags(), converted11->flags()); 201 EXPECT_EQ(original11.flags(), converted11->flags());
204 } 202 }
205 203
206 } // namespace test 204 } // namespace test
207 } // namespace aura 205 } // namespace aura
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/drag_drop/drag_image_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698