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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 445703005: Revert of Moving coordinate conversion methods from ash/wm to ui/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/wm/workspace/workspace_window_resizer.cc ('k') | ui/wm/core/coordinate_conversion.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index bec49eaa15e7f9220a047eefd17c880e260783f0..5c1dd0780a7b4355b42f01873a52cc924afc8a89 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -8,6 +8,7 @@
#include <set>
#include "ash/accelerators/accelerator_commands.h"
+#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/window_state.h"
#include "base/auto_reset.h"
#include "base/callback.h"
@@ -40,7 +41,6 @@
#include "ui/views/focus/view_storage.h"
#include "ui/views/widget/root_view.h"
#include "ui/views/widget/widget.h"
-#include "ui/wm/core/coordinate_conversion.h"
#include "ui/wm/core/window_modality_controller.h"
using base::UserMetricsAction;
@@ -1714,7 +1714,7 @@
// TODO(tdresser): Switch to using gfx::PointF. See crbug.com/337824.
gfx::Point touch_point = gfx::ToFlooredPoint(touch_point_f);
DCHECK(got_touch_point);
- wm::ConvertPointToScreen(widget_window->GetRootWindow(), &touch_point);
+ ash::wm::ConvertPointToScreen(widget_window->GetRootWindow(), &touch_point);
return touch_point;
}
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | ui/wm/core/coordinate_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698