diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 18:33:12 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 18:33:12 +0000 |
| commit | db5a811c493cd82f911cb60cf1e48742aa77055f (patch) | |
| tree | d6bae8d88b027f34594698b98cfd7e216993dfa2 /ui/aura_shell | |
| parent | dac670a36ba66c3ceb9500b2bbdffadd83e48923 (diff) | |
| download | chromium_src-db5a811c493cd82f911cb60cf1e48742aa77055f.zip chromium_src-db5a811c493cd82f911cb60cf1e48742aa77055f.tar.gz chromium_src-db5a811c493cd82f911cb60cf1e48742aa77055f.tar.bz2 | |
aura: Set default mouse cursor on desktop window.
Without this, the pointer is invisible when running on a
Chrome OS machine without the X window manager.
BUG=101120
TEST=manual: checked that i can see the pointer now
Review URL: http://codereview.chromium.org/8368001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/shell.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc index b72ce7f..69023b1 100644 --- a/ui/aura_shell/shell.cc +++ b/ui/aura_shell/shell.cc @@ -138,10 +138,12 @@ Shell* Shell::GetInstance() { } void Shell::Init() { + aura::Desktop* desktop_window = aura::Desktop::GetInstance(); + desktop_window->SetCursor(aura::kCursorPointer); + aura::Window::Windows containers; CreateSpecialContainers(&containers); aura::Window::Windows::const_iterator i; - aura::Desktop* desktop_window = aura::Desktop::GetInstance(); for (i = containers.begin(); i != containers.end(); ++i) { (*i)->Init(); desktop_window->AddChild(*i); @@ -159,7 +161,7 @@ void Shell::Init() { launcher_.reset(new Launcher(toplevel_container)); desktop_layout->set_launcher_widget(launcher_->widget()); desktop_layout->set_status_area_widget(internal::CreateStatusArea()); - aura::Desktop::GetInstance()->screen()->set_work_area_insets( + desktop_window->screen()->set_work_area_insets( gfx::Insets(0, 0, launcher_->widget()->GetWindowScreenBounds().height(), 0)); |