diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:19:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 05:19:32 +0000 |
| commit | 056ce05075d1eccc591007b553acf1a77c9984da (patch) | |
| tree | 0120aab5ede38d13baf801b95b18f2c073657721 /ash/magnifier | |
| parent | 21d32ecf459324e55d24a84a4fc89d9166fa4fc8 (diff) | |
| download | chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.zip chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.gz chromium_src-056ce05075d1eccc591007b553acf1a77c9984da.tar.bz2 | |
Rename RootWindow -> WindowEventDispatcher.
http://crbug.com/308843
R=sky@chromium.org
Review URL: https://codereview.chromium.org/172743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 3f2feff9..77428dc 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -44,11 +44,10 @@ const float kScrollScaleChangeFactor = 0.05f; // |kPanningMergin| from the edge, the view-port moves. const int kPanningMergin = 100; -void MoveCursorTo(aura::RootWindow* root_window, - const gfx::Point& root_location) { +void MoveCursorTo(aura::WindowTreeHost* host, const gfx::Point& root_location) { gfx::Point3F host_location_3f(root_location); - root_window->host()->GetRootTransform().TransformPoint(&host_location_3f); - root_window->host()->MoveCursorToHostLocation( + host->GetRootTransform().TransformPoint(&host_location_3f); + host->MoveCursorToHostLocation( gfx::ToCeiledPoint(host_location_3f.AsPointF())); } @@ -362,7 +361,7 @@ void MagnificationControllerImpl::OnMouseMove(const gfx::Point& location) { if (ret) { // If the magnified region is moved, hides the mouse cursor and moves it. if (x_diff != 0 || y_diff != 0) - MoveCursorTo(root_window_->GetDispatcher(), mouse); + MoveCursorTo(root_window_->GetDispatcher()->host(), mouse); } } } @@ -419,7 +418,8 @@ void MagnificationControllerImpl::OnImplicitAnimationsCompleted() { return; if (move_cursor_after_animation_) { - MoveCursorTo(root_window_->GetDispatcher(), position_after_animation_); + MoveCursorTo(root_window_->GetDispatcher()->host(), + position_after_animation_); move_cursor_after_animation_ = false; aura::client::CursorClient* cursor_client = |