diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 17:53:26 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 17:53:26 +0000 |
| commit | 86e38e4a4cbf129bbc35e824d504fb6fe913208d (patch) | |
| tree | c743a2a8b1e65cec8423c66632bae2b2edee792d /ash | |
| parent | 5c52247ccb2ad6bf77a94381db3d31a7758e65c4 (diff) | |
| download | chromium_src-86e38e4a4cbf129bbc35e824d504fb6fe913208d.zip chromium_src-86e38e4a4cbf129bbc35e824d504fb6fe913208d.tar.gz chromium_src-86e38e4a4cbf129bbc35e824d504fb6fe913208d.tar.bz2 | |
Fix the issue of cursor being shown at startup.
Cursor was shown by MagnificationController when it's enabled in chrome::OpenAsh.
This CL makes MagnificationController not to show cursor if unnecessary.
Also makes cursor initially hidden when the host window is not using full screen
for testing ChromeOS build on desktop.
BUG=157918
TEST=Manually on device and desktop
Review URL: https://chromiumcodereview.appspot.com/11364003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 2 | ||||
| -rw-r--r-- | ash/shell.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 4427a11..d132976 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -361,6 +361,8 @@ void MagnificationControllerImpl::ValidateScale(float* scale) { } void MagnificationControllerImpl::OnImplicitAnimationsCompleted() { + if (!is_on_zooming_) + return; aura::client::CursorClient* cursor_client = aura::client::GetCursorClient(root_window_); if (cursor_client) diff --git a/ash/shell.cc b/ash/shell.cc index a5f5eff..f27c16c 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -552,6 +552,7 @@ void Shell::Init() { if (initially_hide_cursor_) cursor_manager_.ShowCursor(false); + cursor_manager_.SetCursor(ui::kCursorPointer); // Cursor might have been hidden by somethign other than chrome. // Let the first mouse event show the cursor. |