diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:12:02 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:12:02 +0000 |
| commit | 6d6546e0497dae4572bcbf1edbc3950b87046256 (patch) | |
| tree | 0203858fa083a153efb520c1c43d1ee365ec5db8 /ash/wm/shelf_layout_manager_unittest.cc | |
| parent | 43c15cbdfa1af7e5de8ebfcd423b0f84b96795b8 (diff) | |
| download | chromium_src-6d6546e0497dae4572bcbf1edbc3950b87046256.zip chromium_src-6d6546e0497dae4572bcbf1edbc3950b87046256.tar.gz chromium_src-6d6546e0497dae4572bcbf1edbc3950b87046256.tar.bz2 | |
Prepare to support Ash notification tray:
* Separate status area widget from system tray
* Support adding multiple trays to status area widget
* Move the background animation into a common base class
BUG=124914
TEST=Status area should look and behave the same as before.
TBR=ben for ash/ OWNER
Review URL: https://chromiumcodereview.appspot.com/10447040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager_unittest.cc')
| -rw-r--r-- | ash/wm/shelf_layout_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc index 011951d..65606da 100644 --- a/ash/wm/shelf_layout_manager_unittest.cc +++ b/ash/wm/shelf_layout_manager_unittest.cc @@ -509,7 +509,7 @@ TEST_F(ShelfLayoutManagerTest, SetAlignment) { launcher_bounds.width(), shelf->launcher_widget()->GetContentsView()->GetPreferredSize().width()); EXPECT_EQ(SHELF_ALIGNMENT_LEFT, - Shell::GetInstance()->tray()->shelf_alignment()); + Shell::GetInstance()->system_tray()->shelf_alignment()); gfx::Rect status_bounds(shelf->status()->GetWindowScreenBounds()); EXPECT_GE(status_bounds.width(), shelf->status()->GetContentsView()->GetPreferredSize().width()); @@ -532,7 +532,7 @@ TEST_F(ShelfLayoutManagerTest, SetAlignment) { launcher_bounds.width(), shelf->launcher_widget()->GetContentsView()->GetPreferredSize().width()); EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, - Shell::GetInstance()->tray()->shelf_alignment()); + Shell::GetInstance()->system_tray()->shelf_alignment()); status_bounds = gfx::Rect(shelf->status()->GetWindowScreenBounds()); EXPECT_GE(status_bounds.width(), shelf->status()->GetContentsView()->GetPreferredSize().width()); |