diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 16:58:34 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 16:58:34 +0000 |
| commit | cfad875c42dc022d8632dc19b9cf7647b14e9ee9 (patch) | |
| tree | a90005ced7fadb1fb77ff7038e23d822fef95b4f /ash/shelf | |
| parent | 08a21f37b4668e33a2cf760e25f37178712a6de3 (diff) | |
| download | chromium_src-cfad875c42dc022d8632dc19b9cf7647b14e9ee9.zip chromium_src-cfad875c42dc022d8632dc19b9cf7647b14e9ee9.tar.gz chromium_src-cfad875c42dc022d8632dc19b9cf7647b14e9ee9.tar.bz2 | |
Add SessionStateObserver with ActiveUserChanged()
Depends on https://codereview.chromium.org/15974008/ which renames SessionStateObserver to LockStateObserver
* Rename few instances of email to user_id
* Add SessionStateDelegateChromeos implementation
BUG=180903
R=bartfab@chromium.org, skuhne@chromium.org, sky@chromium.org, stevenjb@chromium.org
Review URL: https://codereview.chromium.org/15718003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203985 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 d6e6f28..b8ae5db 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -1246,7 +1246,7 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_GestureRevealsTrayBubble) { generator.GestureScrollSequence(start, end, base::TimeDelta::FromMilliseconds(10), 1); EXPECT_TRUE(tray->HasSystemBubble()); - tray->CloseSystemBubbleForTest(); + tray->CloseSystemBubble(); RunAllPendingInMessageLoop(); EXPECT_FALSE(tray->HasSystemBubble()); @@ -1413,7 +1413,7 @@ TEST_F(ShelfLayoutManagerTest, BubbleEnlargesShelfMouseHitArea) { EXPECT_TRUE(shelf->IsVisible()); if (!i) { // In our first iteration we make sure there is no bubble. - tray->CloseSystemBubbleForTest(); + tray->CloseSystemBubble(); EXPECT_FALSE(status_area_widget->IsMessageBubbleShown()); } else { // In our second iteration we show a bubble. |