diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:11:01 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:11:01 +0000 |
| commit | 88d7112796be37d4e1feb0015cfe95c6f39f303c (patch) | |
| tree | c623905eddba657b6075acb4644259e07b3ef696 /ash/dip_unittest.cc | |
| parent | fe217945ffdce156b66be335271301555704cdf8 (diff) | |
| download | chromium_src-88d7112796be37d4e1feb0015cfe95c6f39f303c.zip chromium_src-88d7112796be37d4e1feb0015cfe95c6f39f303c.tar.gz chromium_src-88d7112796be37d4e1feb0015cfe95c6f39f303c.tar.bz2 | |
Remove Shell::shelf|status_area_widget|launcher and
updated all clients to use one on RootWindowController and/or
Launcher::ForPrimaryDisplay/ForWindow.
BUG=145978
Review URL: https://chromiumcodereview.appspot.com/11017079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/dip_unittest.cc')
| -rw-r--r-- | ash/dip_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index 2a311d5..8ac0adb 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -63,7 +63,7 @@ TEST_F(DIPTest, MAYBE_WorkArea) { // Sanity check if the workarea's inset hight is same as // the launcher's height. - Launcher* launcher = Shell::GetInstance()->launcher(); + Launcher* launcher = Launcher::ForPrimaryDisplay(); EXPECT_EQ( display_2x.bounds().InsetsFrom(work_area).height(), launcher->widget()->GetNativeView()->layer()->bounds().height()); |