summaryrefslogtreecommitdiffstats
path: root/ash/shell/window_watcher_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 04:19:38 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-19 04:19:38 +0000
commit864b5855c27945ea0f099bf82d44f41a041851ff (patch)
tree8f3737b10405128113a113f373f4472727f149de /ash/shell/window_watcher_unittest.cc
parent7a22adbf507b6f35788ea89f12bbd2c1b96d451b (diff)
downloadchromium_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/shell/window_watcher_unittest.cc')
-rw-r--r--ash/shell/window_watcher_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/window_watcher_unittest.cc b/ash/shell/window_watcher_unittest.cc
index 31959e6..285c313 100644
--- a/ash/shell/window_watcher_unittest.cc
+++ b/ash/shell/window_watcher_unittest.cc
@@ -25,7 +25,7 @@ TEST_F(WindowWatcherTest, ShellDeleteInstance) {
shell::ShellDelegateImpl* delegate = new ash::shell::ShellDelegateImpl;
Shell::CreateInstance(delegate);
Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->Show();
- Shell::GetInstance()->CreateLauncher();
+ Shell::GetInstance()->CreateShelf();
Shell::GetInstance()->UpdateAfterLoginStatusChange(
user::LOGGED_IN_USER);