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

6 files changed, 45 insertions, 45 deletions

diff --git a/ash/test/launcher_test_api.cc b/ash/test/launcher_test_api.cc
deleted file mode 100644
index 2e56a86..0000000
--- a/ash/test/launcher_test_api.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/test/launcher_test_api.h"
-
-#include "ash/launcher/launcher.h"
-
-namespace ash {
-namespace test {
-
-LauncherTestAPI::LauncherTestAPI(Launcher* launcher)
-    : launcher_(launcher) {
-}
-
-LauncherTestAPI::~LauncherTestAPI() {
-}
-
-internal::ShelfView* LauncherTestAPI::shelf_view() {
-  return launcher_->shelf_view_;
-}
-
-void LauncherTestAPI::SetShelfDelegate(ShelfDelegate* delegate) {
-  launcher_->delegate_ = delegate;
-}
-
-}  // namespace test
-}  // namespace ash
diff --git a/ash/test/shelf_test_api.cc b/ash/test/shelf_test_api.cc
new file mode 100644
index 0000000..0ce27f7
--- /dev/null
+++ b/ash/test/shelf_test_api.cc
@@ -0,0 +1,28 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/test/shelf_test_api.h"
+
+#include "ash/shelf/shelf.h"
+
+namespace ash {
+namespace test {
+
+ShelfTestAPI::ShelfTestAPI(Shelf* shelf)
+    : shelf_(shelf) {
+}
+
+ShelfTestAPI::~ShelfTestAPI() {
+}
+
+internal::ShelfView* ShelfTestAPI::shelf_view() {
+  return shelf_->shelf_view_;
+}
+
+void ShelfTestAPI::SetShelfDelegate(ShelfDelegate* delegate) {
+  shelf_->delegate_ = delegate;
+}
+
+}  // namespace test
+}  // namespace ash
diff --git a/ash/test/launcher_test_api.h b/ash/test/shelf_test_api.h
index d838339..48aafda 100644
--- a/ash/test/launcher_test_api.h
+++ b/ash/test/shelf_test_api.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_TEST_LAUNCHER_TEST_API_H_
-#define ASH_TEST_LAUNCHER_TEST_API_H_
+#ifndef ASH_TEST_SHELF_TEST_API_H_
+#define ASH_TEST_SHELF_TEST_API_H_
 
 #include "base/basictypes.h"
 
 namespace ash {
 
-class Launcher;
+class Shelf;
 class ShelfDelegate;
 
 namespace internal {
@@ -18,12 +18,12 @@ class ShelfView;
 
 namespace test {
 
-// Use the api in this class to access private members of Launcher.
-class LauncherTestAPI {
+// Use the api in this class to access private members of Shelf.
+class ShelfTestAPI {
  public:
-  explicit LauncherTestAPI(Launcher* launcher);
+  explicit ShelfTestAPI(Shelf* shelf);
 
-  ~LauncherTestAPI();
+  ~ShelfTestAPI();
 
   // An accessor for |shelf_view|.
   internal::ShelfView* shelf_view();
@@ -32,12 +32,12 @@ class LauncherTestAPI {
   void SetShelfDelegate(ShelfDelegate* delegate);
 
  private:
-  Launcher* launcher_;
+  Shelf* shelf_;
 
-  DISALLOW_COPY_AND_ASSIGN(LauncherTestAPI);
+  DISALLOW_COPY_AND_ASSIGN(ShelfTestAPI);
 };
 
 }  // namespace test
 }  // namespace ash
 
-#endif  // ASH_TEST_LAUNCHER_TEST_API_H_
+#endif  // ASH_TEST_SHELF_TEST_API_H_
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);
   }
diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc
index 1a62cff..97623ca 100644
--- a/ash/test/test_shelf_delegate.cc
+++ b/ash/test/test_shelf_delegate.cc
@@ -71,15 +71,15 @@ void TestShelfDelegate::OnWindowHierarchyChanging(
       const HierarchyChangeParams& params) {
   // The window may be legitimately reparented while staying open if it moves
   // to another display or container. If the window does not have a new parent
-  // then remove the launcher item.
+  // then remove the shelf item.
   if (!params.new_parent)
     RemoveLauncherItemForWindow(params.target);
 }
 
-void TestShelfDelegate::OnLauncherCreated(Launcher* launcher) {
+void TestShelfDelegate::OnShelfCreated(Shelf* shelf) {
 }
 
-void TestShelfDelegate::OnLauncherDestroyed(Launcher* launcher) {
+void TestShelfDelegate::OnShelfDestroyed(Shelf* shelf) {
 }
 
 LauncherID TestShelfDelegate::GetLauncherIDForAppID(const std::string& app_id) {
diff --git a/ash/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h
index e475453..263d1aa 100644
--- a/ash/test/test_shelf_delegate.h
+++ b/ash/test/test_shelf_delegate.h
@@ -37,8 +37,8 @@ class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver {
       const HierarchyChangeParams& params) OVERRIDE;
 
   // ShelfDelegate implementation.
-  virtual void OnLauncherCreated(Launcher* launcher) OVERRIDE;
-  virtual void OnLauncherDestroyed(Launcher* launcher) OVERRIDE;
+  virtual void OnShelfCreated(Shelf* shelf) OVERRIDE;
+  virtual void OnShelfDestroyed(Shelf* shelf) OVERRIDE;
   virtual LauncherID GetLauncherIDForAppID(const std::string& app_id) OVERRIDE;
   virtual const std::string& GetAppIDForLauncherID(LauncherID id) OVERRIDE;
   virtual void PinAppWithID(const std::string& app_id) OVERRIDE;