diff options
author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 20:18:35 +0000 |
---|---|---|
committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 20:18:35 +0000 |
commit | 151ffdff429adc13dea9afbe18602745981a9dcc (patch) | |
tree | 65ea7ff184d3e543d2a6213e29a96119eed4081b /chrome/browser/ui/ash | |
parent | 843fe4276bb2a001d6bdbb74dda7ef44a707cec7 (diff) | |
download | chromium_src-151ffdff429adc13dea9afbe18602745981a9dcc.zip chromium_src-151ffdff429adc13dea9afbe18602745981a9dcc.tar.gz chromium_src-151ffdff429adc13dea9afbe18602745981a9dcc.tar.bz2 |
Move ash specific cursor code to CursorManager.
Main changes are as follows.
- Move the responsibility of managing cursors to ash::CursorManager from aura::RootWindowHostLinux.
- Set the same cursor to all root windows with CursorManager so that cursor is updated properly while dragging across displays
- Introduce CursorLoader class, which implements platform specific cursor loading.
- Add SetDeviceScaleFactor to CursorClient, which sets the device scale factor used for the cursor.
BUG=132862,144756
Review URL: https://chromiumcodereview.appspot.com/10919135
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/ash')
-rw-r--r-- | chrome/browser/ui/ash/ash_init.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc index 9462a66..5b55217 100644 --- a/chrome/browser/ui/ash/ash_init.cc +++ b/chrome/browser/ui/ash/ash_init.cc @@ -31,6 +31,7 @@ #include "chrome/browser/ui/ash/ime_controller_chromeos.h" #include "chrome/browser/ui/ash/keyboard_brightness_controller_chromeos.h" #include "chrome/browser/ui/ash/volume_controller_chromeos.h" +#include "ui/base/x/x11_util.h" #endif @@ -48,14 +49,18 @@ void OpenAsh() { switches::kAuraHostWindowUseFullscreen); #if defined(OS_CHROMEOS) - if (base::chromeos::IsRunningOnChromeOS()) + if (base::chromeos::IsRunningOnChromeOS()) { use_fullscreen = true; + // Hides the cursor outside of the Aura root window. The cursor will be + // drawn within the Aura root window, and it'll remain hidden after the + // Aura window is closed. + ui::HideHostCursor(); + } #endif if (use_fullscreen) { aura::DisplayManager::set_use_fullscreen_host_window(true); #if defined(OS_CHROMEOS) - aura::RootWindow::set_hide_host_cursor(true); // Hide the mouse cursor completely at boot. if (!chromeos::UserManager::Get()->IsUserLoggedIn()) ash::Shell::set_initially_hide_cursor(true); |