diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 00:41:50 +0000 |
| commit | 42713f747e45ec2d4d754f449ba8a0edf5deffe6 (patch) | |
| tree | a278abbd3cf1496c36793168ab27a0d43eb6cd55 /ash/shell | |
| parent | 07f1c36a10e6a5dffb01ea324bc8ca8d11b9653f (diff) | |
| download | chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.zip chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.gz chromium_src-42713f747e45ec2d4d754f449ba8a0edf5deffe6.tar.bz2 | |
Rename GetRootWindow() -> GetPrimaryRootWindow()
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10442017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 2 | ||||
| -rw-r--r-- | ash/shell/lock_view.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 2ce1d23..c562f22 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -92,7 +92,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { ash::shell::InitWindowTypeLauncher(); - ash::Shell::GetRootWindow()->ShowRootWindow(); + ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); } void ShellBrowserMainParts::PostMainMessageLoopRun() { diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc index a604e89..3c90679 100644 --- a/ash/shell/lock_view.cc +++ b/ash/shell/lock_view.cc @@ -86,7 +86,7 @@ void CreateLockScreen() { views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); gfx::Size ps = lock_view->GetPreferredSize(); - gfx::Size root_window_size = Shell::GetRootWindow()->bounds().size(); + gfx::Size root_window_size = Shell::GetPrimaryRootWindow()->bounds().size(); params.bounds = gfx::Rect((root_window_size.width() - ps.width()) / 2, (root_window_size.height() - ps.height()) / 2, ps.width(), ps.height()); |