diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 04:19:38 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 04:19:38 +0000 |
| commit | 864b5855c27945ea0f099bf82d44f41a041851ff (patch) | |
| tree | 8f3737b10405128113a113f373f4472727f149de /ash/test/test_session_state_delegate.cc | |
| parent | 7a22adbf507b6f35788ea89f12bbd2c1b96d451b (diff) | |
| download | chromium_src-864b5855c27945ea0f099bf82d44f41a041851ff.zip chromium_src-864b5855c27945ea0f099bf82d44f41a041851ff.tar.gz chromium_src-864b5855c27945ea0f099bf82d44f41a041851ff.tar.bz2 | |
Rename Launcher to Shelf.
- move launcher* from launcher to shelf.
- rename to launcher.* to shelf.* and launcher_unittest.cc to
shelf_unittest.cc
- rename LauncherTestAPI to ShelfTestAPI.
- rename to launcher_test_api.* to shelf_test_api.*
BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org
TBR=sky
Review URL: https://codereview.chromium.org/115113006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/test_session_state_delegate.cc')
| -rw-r--r-- | ash/test/test_session_state_delegate.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index 5c16807..a0d8f19 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -85,7 +85,7 @@ void TestSessionStateDelegate::SetHasActiveUser(bool has_active_user) { if (!has_active_user) active_user_session_started_ = false; else - Shell::GetInstance()->ShowLauncher(); + Shell::GetInstance()->ShowShelf(); } void TestSessionStateDelegate::SetActiveUserSessionStarted( @@ -93,7 +93,7 @@ void TestSessionStateDelegate::SetActiveUserSessionStarted( active_user_session_started_ = active_user_session_started; if (active_user_session_started) { has_active_user_ = true; - Shell::GetInstance()->CreateLauncher(); + Shell::GetInstance()->CreateShelf(); Shell::GetInstance()->UpdateAfterLoginStatusChange( user::LOGGED_IN_USER); } |