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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.cc

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/frame_maximize_button.cc ('k') | ash/wm/workspace/workspace_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/multi_window_resize_controller.cc
===================================================================
--- ash/wm/workspace/multi_window_resize_controller.cc (revision 150582)
+++ ash/wm/workspace/multi_window_resize_controller.cc (working copy)
@@ -180,7 +180,7 @@
windows_.window1->AddObserver(this);
windows_.window2->AddObserver(this);
show_location_in_parent_ = point_in_window;
- Window::ConvertPointToWindow(
+ Window::ConvertPointToTarget(
window, window->parent(), &show_location_in_parent_);
if (show_timer_.IsRunning())
return;
@@ -225,7 +225,7 @@
const gfx::Point& point) const {
ResizeWindows result;
gfx::Point point_in_parent(point);
- Window::ConvertPointToWindow(window, window->parent(), &point_in_parent);
+ Window::ConvertPointToTarget(window, window->parent(), &point_in_parent);
switch (window_component) {
case HTRIGHT:
result.direction = LEFT_RIGHT;
@@ -505,7 +505,7 @@
return false;
gfx::Point window_loc(location_in_screen);
- aura::Window::ConvertPointToWindow(
+ aura::Window::ConvertPointToTarget(
window->GetRootWindow(), window, &window_loc);
return window->HitTest(window_loc) &&
window->delegate()->GetNonClientComponent(window_loc) == component;
« no previous file with comments | « ash/wm/workspace/frame_maximize_button.cc ('k') | ash/wm/workspace/workspace_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698