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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_tracker.cc
diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc
index 8b48ebaa0703373e4dcecfac646df0801eb20e92..48b877f3c62eebda1961f8a9d8e7f6df43025e07 100644
--- a/ash/drag_drop/drag_drop_tracker.cc
+++ b/ash/drag_drop/drag_drop_tracker.cc
@@ -4,8 +4,8 @@
#include "ash/drag_drop/drag_drop_tracker.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
#include "ui/aura/client/window_parenting_client.h"
@@ -70,7 +70,7 @@ aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
gfx::Point location_in_screen = event.location();
::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
aura::Window* root_window_at_point =
- WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen));
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(location_in_screen));
gfx::Point location_in_root = location_in_screen;
::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root);
return root_window_at_point->GetEventHandlerForPoint(location_in_root);
@@ -87,7 +87,7 @@ ui::LocatedEvent* DragDropTracker::ConvertEvent(aura::Window* target,
gfx::Point target_root_location = event.root_location();
aura::Window::ConvertPointToTarget(
capture_window_->GetRootWindow(),
- WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)),
+ WmWindow::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)),
&target_root_location);
return new ui::MouseEvent(
event.type(), target_location, target_root_location,
« 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