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

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

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | ash/drag_drop/drag_drop_tracker_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/aura/wm_window_aura.h"
8 #include "ash/common/wm/root_window_finder.h" 7 #include "ash/common/wm/root_window_finder.h"
8 #include "ash/common/wm_window.h"
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ui/aura/client/window_parenting_client.h" 11 #include "ui/aura/client/window_parenting_client.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
14 #include "ui/events/event.h" 14 #include "ui/events/event.h"
15 #include "ui/events/event_utils.h" 15 #include "ui/events/event_utils.h"
16 #include "ui/wm/core/coordinate_conversion.h" 16 #include "ui/wm/core/coordinate_conversion.h"
17 #include "ui/wm/public/activation_delegate.h" 17 #include "ui/wm/public/activation_delegate.h"
18 18
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 void DragDropTracker::TakeCapture() { 64 void DragDropTracker::TakeCapture() {
65 capture_window_->SetCapture(); 65 capture_window_->SetCapture();
66 } 66 }
67 67
68 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) { 68 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
69 DCHECK(capture_window_.get()); 69 DCHECK(capture_window_.get());
70 gfx::Point location_in_screen = event.location(); 70 gfx::Point location_in_screen = event.location();
71 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen); 71 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
72 aura::Window* root_window_at_point = 72 aura::Window* root_window_at_point =
73 WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)); 73 WmWindow::GetAuraWindow(wm::GetRootWindowAt(location_in_screen));
74 gfx::Point location_in_root = location_in_screen; 74 gfx::Point location_in_root = location_in_screen;
75 ::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root); 75 ::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root);
76 return root_window_at_point->GetEventHandlerForPoint(location_in_root); 76 return root_window_at_point->GetEventHandlerForPoint(location_in_root);
77 } 77 }
78 78
79 ui::LocatedEvent* DragDropTracker::ConvertEvent(aura::Window* target, 79 ui::LocatedEvent* DragDropTracker::ConvertEvent(aura::Window* target,
80 const ui::LocatedEvent& event) { 80 const ui::LocatedEvent& event) {
81 DCHECK(capture_window_.get()); 81 DCHECK(capture_window_.get());
82 gfx::Point target_location = event.location(); 82 gfx::Point target_location = event.location();
83 aura::Window::ConvertPointToTarget(capture_window_.get(), target, 83 aura::Window::ConvertPointToTarget(capture_window_.get(), target,
84 &target_location); 84 &target_location);
85 gfx::Point location_in_screen = event.location(); 85 gfx::Point location_in_screen = event.location();
86 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen); 86 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
87 gfx::Point target_root_location = event.root_location(); 87 gfx::Point target_root_location = event.root_location();
88 aura::Window::ConvertPointToTarget( 88 aura::Window::ConvertPointToTarget(
89 capture_window_->GetRootWindow(), 89 capture_window_->GetRootWindow(),
90 WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)), 90 WmWindow::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)),
91 &target_root_location); 91 &target_root_location);
92 return new ui::MouseEvent( 92 return new ui::MouseEvent(
93 event.type(), target_location, target_root_location, 93 event.type(), target_location, target_root_location,
94 ui::EventTimeForNow(), event.flags(), 94 ui::EventTimeForNow(), event.flags(),
95 static_cast<const ui::MouseEvent&>(event).changed_button_flags()); 95 static_cast<const ui::MouseEvent&>(event).changed_button_flags());
96 } 96 }
97 97
98 } // namespace ash 98 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | ash/drag_drop/drag_drop_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698