diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-10 22:57:09 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-10 22:57:09 +0000 |
| commit | a0afeb1aafd479aed625b2a6c6e0fc02b5348962 (patch) | |
| tree | 5a69548fe6278196c3dc69bfb1758cfa01444057 /ash/extended_desktop_unittest.cc | |
| parent | 6d6587c3b5f3d1a3a5b7b03272c957a44d6acc71 (diff) | |
| download | chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.zip chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.tar.gz chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.tar.bz2 | |
[Launcher per display] Removed Shell::status_area_widget(), system_tray()
HasPrimaryStatusArea/GetPrimarySystemTray for login screen
which will have only one tray/status area on primary
BUG=145978
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11476033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
| -rw-r--r-- | ash/extended_desktop_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index c153a60..716b9f2 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -577,7 +577,7 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) { TEST_F(ExtendedDesktopTest, OpenSystemTray) { UpdateDisplay("500x600,600x400"); - SystemTray* tray = ash::Shell::GetInstance()->system_tray(); + SystemTray* tray = ash::Shell::GetInstance()->GetPrimarySystemTray(); ASSERT_FALSE(tray->HasSystemBubble()); // Opens the tray by a dummy click event and makes sure that adding/removing |