diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:45:48 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:45:48 +0000 |
| commit | 52194b7878a80b15ea3fd81a190aa360d6a9da6f (patch) | |
| tree | 180bf0e31457a41c84fc9e73b61c3a5dccebe305 /ui | |
| parent | cbb5635117d92850377a52fc4e1f2f1f064b5012 (diff) | |
| download | chromium_src-52194b7878a80b15ea3fd81a190aa360d6a9da6f.zip chromium_src-52194b7878a80b15ea3fd81a190aa360d6a9da6f.tar.gz chromium_src-52194b7878a80b15ea3fd81a190aa360d6a9da6f.tar.bz2 | |
aura: Lay out widgets when no X window manager is running.
When there's no window manager running, we don't get any
ConfigureNotify events about the host window (since our
initial size is honored and no resizes happen after that).
This change makes us force a layout when adding each widget
to DesktopLayoutManager. Otherwise, all of the widgets stay
stuck in the upper-left corner of the window.
BUG=100979
TEST=manual: ran it on a device with no window manager
Review URL: http://codereview.chromium.org/8361007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura_shell/desktop_layout_manager.h | 2 | ||||
| -rw-r--r-- | ui/aura_shell/shell.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/aura_shell/desktop_layout_manager.h b/ui/aura_shell/desktop_layout_manager.h index 28e1f02..d46a923 100644 --- a/ui/aura_shell/desktop_layout_manager.h +++ b/ui/aura_shell/desktop_layout_manager.h @@ -39,10 +39,10 @@ class DesktopLayoutManager : public aura::LayoutManager { status_area_widget_ = status_area_widget; } - private: // Overridden from aura::LayoutManager: virtual void OnWindowResized() OVERRIDE; + private: aura::Window* owner_; views::Widget* background_widget_; diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc index a44d5eb..b72ce7f 100644 --- a/ui/aura_shell/shell.cc +++ b/ui/aura_shell/shell.cc @@ -162,6 +162,9 @@ void Shell::Init() { aura::Desktop::GetInstance()->screen()->set_work_area_insets( gfx::Insets(0, 0, launcher_->widget()->GetWindowScreenBounds().height(), 0)); + + // Force a layout. + desktop_layout->OnWindowResized(); } void Shell::SetDelegate(ShellDelegate* delegate) { |