summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
authorjonross <jonross@chromium.org>2014-11-07 06:45:23 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-07 14:45:46 +0000
commit93c5873f5b657487f7166d2958f78b46a668600b (patch)
tree1753a0a418ccdf3fb79531749169f31db2375190 /ash/wm
parentfc4af2accba1f4457131ef737fe52238010d080a (diff)
downloadchromium_src-93c5873f5b657487f7166d2958f78b46a668600b.zip
chromium_src-93c5873f5b657487f7166d2958f78b46a668600b.tar.gz
chromium_src-93c5873f5b657487f7166d2958f78b46a668600b.tar.bz2
Hide Mouse Cursor when entering Maximize Mode
When disabling the touchpad also hide the cursor. TEST=Manual: place mouse in middle of screen, enter TouchView mode. BUG=429769 Review URL: https://codereview.chromium.org/707013003 Cr-Commit-Position: refs/heads/master@{#303234}
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
index 4093e6e..6b14045 100644
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
@@ -13,6 +13,7 @@
#include "ash/shell.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
+#include "ui/aura/client/cursor_client.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -83,6 +84,8 @@ ScopedDisableInternalMouseAndKeyboardX11::
if (device_name == kInternalTouchpadName) {
touchpad_device_id_ = xi_dev_list[i].deviceid;
device_data_manager->DisableDevice(touchpad_device_id_);
+ aura::client::GetCursorClient(
+ Shell::GetInstance()->GetPrimaryRootWindow())->HideCursor();
} else if (device_name == kInternalKeyboardName) {
keyboard_device_id_ = xi_dev_list[i].deviceid;
device_data_manager->DisableDevice(keyboard_device_id_);