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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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_controller_unittest.cc ('k') | ash/focus_cycler_unittest.cc » ('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/wm/coordinate_conversion.h" 9 #include "ash/wm/coordinate_conversion.h"
10 #include "ui/aura/client/window_tree_client.h" 10 #include "ui/aura/client/window_tree_client.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 void DragDropTracker::TakeCapture() { 44 void DragDropTracker::TakeCapture() {
45 capture_window_->SetCapture(); 45 capture_window_->SetCapture();
46 } 46 }
47 47
48 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) { 48 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
49 DCHECK(capture_window_.get()); 49 DCHECK(capture_window_.get());
50 gfx::Point location_in_screen = event.location(); 50 gfx::Point location_in_screen = event.location();
51 wm::ConvertPointToScreen(capture_window_.get(), 51 wm::ConvertPointToScreen(capture_window_.get(),
52 &location_in_screen); 52 &location_in_screen);
53 aura::RootWindow* root_window_at_point = 53 aura::Window* root_window_at_point =
54 wm::GetRootWindowAt(location_in_screen); 54 wm::GetRootWindowAt(location_in_screen);
55 gfx::Point location_in_root = location_in_screen; 55 gfx::Point location_in_root = location_in_screen;
56 wm::ConvertPointFromScreen(root_window_at_point, &location_in_root); 56 wm::ConvertPointFromScreen(root_window_at_point, &location_in_root);
57 return root_window_at_point->GetEventHandlerForPoint(location_in_root); 57 return root_window_at_point->GetEventHandlerForPoint(location_in_root);
58 } 58 }
59 59
60 ui::LocatedEvent* DragDropTracker::ConvertEvent( 60 ui::LocatedEvent* DragDropTracker::ConvertEvent(
61 aura::Window* target, 61 aura::Window* target,
62 const ui::LocatedEvent& event) { 62 const ui::LocatedEvent& event) {
63 DCHECK(capture_window_.get()); 63 DCHECK(capture_window_.get());
64 gfx::Point target_location = event.location(); 64 gfx::Point target_location = event.location();
65 aura::Window::ConvertPointToTarget(capture_window_.get(), target, 65 aura::Window::ConvertPointToTarget(capture_window_.get(), target,
66 &target_location); 66 &target_location);
67 gfx::Point location_in_screen = event.location(); 67 gfx::Point location_in_screen = event.location();
68 ash::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen); 68 ash::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
69 gfx::Point target_root_location = event.root_location(); 69 gfx::Point target_root_location = event.root_location();
70 aura::Window::ConvertPointToTarget( 70 aura::Window::ConvertPointToTarget(
71 capture_window_->GetRootWindow(), 71 capture_window_->GetRootWindow(),
72 ash::wm::GetRootWindowAt(location_in_screen), 72 ash::wm::GetRootWindowAt(location_in_screen),
73 &target_root_location); 73 &target_root_location);
74 return new ui::MouseEvent(event.type(), 74 return new ui::MouseEvent(event.type(),
75 target_location, 75 target_location,
76 target_root_location, 76 target_root_location,
77 event.flags()); 77 event.flags());
78 } 78 }
79 79
80 } // namespace internal 80 } // namespace internal
81 } // namespace ash 81 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698