diff options
author | alicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 21:53:24 +0000 |
---|---|---|
committer | alicet@chromium.org <alicet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 21:53:24 +0000 |
commit | 5a89a75e28cb4e735b7315e05cfc657a9b664928 (patch) | |
tree | 4770a964b6c2fa4714ea45e87e72bf333e42bb39 /ash/shell/lock_view.cc | |
parent | d1d67d89bbb69e71f50ba9a0e6ede189f0ae1cff (diff) | |
download | chromium_src-5a89a75e28cb4e735b7315e05cfc657a9b664928.zip chromium_src-5a89a75e28cb4e735b7315e05cfc657a9b664928.tar.gz chromium_src-5a89a75e28cb4e735b7315e05cfc657a9b664928.tar.bz2 |
Update widget initialization for screen lock, settings bubble and menus to set up parent container before widget initialization. This allows widget to be initiated with proper parent bounds taken into initial bounds calculation.
In particular, in compact mode, the default container layer have different bounds and transformation than all other layers. If windows are initialized with the default container and then added to the intended containers, bounds and transformation of the new windows may need to be updated after this move between layers.
BUG=112322
TEST=tested on alex for screenlock/volume/brightness bubbles to show up even when the user was on a new window in compact mode.
Review URL: http://codereview.chromium.org/9314041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/lock_view.cc')
-rw-r--r-- | ash/shell/lock_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index 51aa692..5128b12 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -62,10 +62,10 @@ void CreateLockScreen() { (root_window_size.height() - ps.height()) / 2, ps.width(), ps.height()); params.delegate = lock_view; + params.parent = + Shell::GetInstance()->GetContainer( + ash::internal::kShellWindowId_LockScreenContainer); widget->Init(params); - Shell::GetInstance()->GetContainer( - ash::internal::kShellWindowId_LockScreenContainer)-> - AddChild(widget->GetNativeView()); widget->SetContentsView(lock_view); widget->Show(); widget->GetNativeView()->SetName("LockView"); |