diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 06:48:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 06:48:56 +0000 |
| commit | 102d4efc86b9a546dfba16b9eb781ad2de03bed6 (patch) | |
| tree | 09cf833dd08b01f186c437b1685a0f3bca188705 /ash/shell | |
| parent | 05e49a269413f1d1c09cf43b6de180194d03efad (diff) | |
| download | chromium_src-102d4efc86b9a546dfba16b9eb781ad2de03bed6.zip chromium_src-102d4efc86b9a546dfba16b9eb781ad2de03bed6.tar.gz chromium_src-102d4efc86b9a546dfba16b9eb781ad2de03bed6.tar.bz2 | |
* Add RootWindow to RootWindowObserver::OnRootWindowResized as there can be more than one root window now.
* Don't translate size in GetHostSize
* Fix a few places that should use RootWindow's bounds instead of host bounds.
BUG=115510
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9802001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/lock_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index 1ba1e1e..c8a4d82 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -57,7 +57,7 @@ void CreateLockScreen() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL); gfx::Size ps = lock_view->GetPreferredSize(); - gfx::Size root_window_size = Shell::GetRootWindow()->GetHostSize(); + gfx::Size root_window_size = Shell::GetRootWindow()->bounds().size(); params.bounds = gfx::Rect((root_window_size.width() - ps.width()) / 2, (root_window_size.height() - ps.height()) / 2, ps.width(), ps.height()); |