diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 00:59:50 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 00:59:50 +0000 |
| commit | 7e778b6fae741045e60074d60514d0372576e156 (patch) | |
| tree | 41ea7eb97448920289c1d2e49833b64222087c57 /ash/shelf | |
| parent | 96fa304a3c62935792cb42c17cf8544d73091543 (diff) | |
| download | chromium_src-7e778b6fae741045e60074d60514d0372576e156.zip chromium_src-7e778b6fae741045e60074d60514d0372576e156.tar.gz chromium_src-7e778b6fae741045e60074d60514d0372576e156.tar.bz2 | |
Replace NetworkMessageObserver with Ash code using NetworkStateHandler
Note: Depends on https://chromiumcodereview.appspot.com/12726002/
BUG=164236
For ash.gyp and shelf_layout_manager_unittest:
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12440012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_layout_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index fe900a3..ded8741 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -914,7 +914,7 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_GestureRevealsTrayBubble) { generator.GestureScrollSequence(start, end, base::TimeDelta::FromMilliseconds(10), 1); EXPECT_TRUE(tray->HasSystemBubble()); - tray->CloseBubbleForTest(); + tray->CloseSystemBubbleForTest(); RunAllPendingInMessageLoop(); EXPECT_FALSE(tray->HasSystemBubble()); @@ -1081,7 +1081,7 @@ TEST_F(ShelfLayoutManagerTest, BubbleEnlargesShelfMouseHitArea) { EXPECT_TRUE(shelf->IsVisible()); if (!i) { // In our first iteration we make sure there is no bubble. - tray->CloseBubbleForTest(); + tray->CloseSystemBubbleForTest(); EXPECT_FALSE(status_area_widget->IsMessageBubbleShown()); } else { // In our second iteration we show a bubble. |