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

Unified Diff: ash/autoclick/autoclick_controller.cc

Issue 425363002: Moving coordinate conversion methods from ash/wm to ui/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format Created 6 years, 5 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 | « no previous file | ash/display/event_transformation_handler.cc » ('j') | ui/wm/core/coordinate_conversion.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/autoclick/autoclick_controller.cc
diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
index e356602874167af7d106d648fba3eee6b26f65b4..606b3975c922a5bde627ccf846ee49c07f1630c1 100644
--- a/ash/autoclick/autoclick_controller.cc
+++ b/ash/autoclick/autoclick_controller.cc
@@ -15,6 +15,7 @@
#include "ui/events/event_processor.h"
#include "ui/gfx/point.h"
#include "ui/gfx/vector2d.h"
+#include "ui/wm/core/coordinate_conversion.h"
namespace ash {
@@ -128,9 +129,8 @@ void AutoclickControllerImpl::OnMouseEvent(ui::MouseEvent* event) {
mouse_event_flags_ = event->flags();
gfx::Point mouse_location = event->root_location();
- ash::wm::ConvertPointToScreen(
- wm::GetRootWindowAt(mouse_location),
- &mouse_location);
+ ::wm::ConvertPointToScreen(ash::wm::GetRootWindowAt(mouse_location),
oshima 2014/08/02 00:34:13 remove ash:: (as this is in ash namespace)
mfomitchev 2014/08/02 14:50:17 Done.
+ &mouse_location);
// The distance between the mouse location and the anchor location
// must exceed a certain threshold to initiate a new autoclick countdown.
@@ -185,7 +185,7 @@ void AutoclickControllerImpl::DoAutoclick() {
gfx::Point click_location(screen_location);
anchor_location_ = click_location;
- wm::ConvertPointFromScreen(root_window, &click_location);
+ ::wm::ConvertPointFromScreen(root_window, &click_location);
aura::WindowTreeHost* host = root_window->GetHost();
host->ConvertPointToHost(&click_location);
« no previous file with comments | « no previous file | ash/display/event_transformation_handler.cc » ('j') | ui/wm/core/coordinate_conversion.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698