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

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

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state
Patch Set: nit and merge Created 4 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
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.h ('k') | ash/extended_desktop_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/aura/wm_window_aura.h"
10 #include "ash/wm/common/root_window_finder.h"
10 #include "ui/aura/client/window_tree_client.h" 11 #include "ui/aura/client/window_tree_client.h"
11 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
12 #include "ui/aura/window_event_dispatcher.h" 13 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/events/event.h" 14 #include "ui/events/event.h"
14 #include "ui/events/event_utils.h" 15 #include "ui/events/event_utils.h"
15 #include "ui/gfx/screen.h" 16 #include "ui/gfx/screen.h"
16 #include "ui/wm/core/coordinate_conversion.h" 17 #include "ui/wm/core/coordinate_conversion.h"
17 #include "ui/wm/public/activation_delegate.h" 18 #include "ui/wm/public/activation_delegate.h"
18 19
19 namespace ash { 20 namespace ash {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 66
66 void DragDropTracker::TakeCapture() { 67 void DragDropTracker::TakeCapture() {
67 capture_window_->SetCapture(); 68 capture_window_->SetCapture();
68 } 69 }
69 70
70 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) { 71 aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
71 DCHECK(capture_window_.get()); 72 DCHECK(capture_window_.get());
72 gfx::Point location_in_screen = event.location(); 73 gfx::Point location_in_screen = event.location();
73 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen); 74 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
74 aura::Window* root_window_at_point = 75 aura::Window* root_window_at_point =
75 wm::GetRootWindowAt(location_in_screen); 76 wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen));
76 gfx::Point location_in_root = location_in_screen; 77 gfx::Point location_in_root = location_in_screen;
77 ::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root); 78 ::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root);
78 return root_window_at_point->GetEventHandlerForPoint(location_in_root); 79 return root_window_at_point->GetEventHandlerForPoint(location_in_root);
79 } 80 }
80 81
81 ui::LocatedEvent* DragDropTracker::ConvertEvent( 82 ui::LocatedEvent* DragDropTracker::ConvertEvent(
82 aura::Window* target, 83 aura::Window* target,
83 const ui::LocatedEvent& event) { 84 const ui::LocatedEvent& event) {
84 DCHECK(capture_window_.get()); 85 DCHECK(capture_window_.get());
85 gfx::Point target_location = event.location(); 86 gfx::Point target_location = event.location();
86 aura::Window::ConvertPointToTarget(capture_window_.get(), target, 87 aura::Window::ConvertPointToTarget(capture_window_.get(), target,
87 &target_location); 88 &target_location);
88 gfx::Point location_in_screen = event.location(); 89 gfx::Point location_in_screen = event.location();
89 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen); 90 ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
90 gfx::Point target_root_location = event.root_location(); 91 gfx::Point target_root_location = event.root_location();
91 aura::Window::ConvertPointToTarget( 92 aura::Window::ConvertPointToTarget(
92 capture_window_->GetRootWindow(), 93 capture_window_->GetRootWindow(),
93 ash::wm::GetRootWindowAt(location_in_screen), 94 wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)),
94 &target_root_location); 95 &target_root_location);
95 return new ui::MouseEvent( 96 return new ui::MouseEvent(
96 event.type(), target_location, target_root_location, 97 event.type(), target_location, target_root_location,
97 ui::EventTimeForNow(), event.flags(), 98 ui::EventTimeForNow(), event.flags(),
98 static_cast<const ui::MouseEvent&>(event).changed_button_flags()); 99 static_cast<const ui::MouseEvent&>(event).changed_button_flags());
99 } 100 }
100 101
101 } // namespace ash 102 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.h ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698