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

1 files changed, 5 insertions, 6 deletions

diff --git a/ash/first_run/first_run_helper_impl.cc b/ash/first_run/first_run_helper_impl.cc
index 9efb0db..f8a3ca6 100644
--- a/ash/first_run/first_run_helper_impl.cc
+++ b/ash/first_run/first_run_helper_impl.cc
@@ -4,7 +4,7 @@
 
 #include "ash/first_run/first_run_helper_impl.h"
 
-#include "ash/launcher/launcher.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
@@ -64,13 +64,13 @@ void FirstRunHelperImpl::CloseAppList() {
 }
 
 gfx::Rect FirstRunHelperImpl::GetLauncherBounds() {
-  ash::Launcher* launcher = ash::Launcher::ForPrimaryDisplay();
-  return launcher->GetVisibleItemsBoundsInScreen();
+  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  return shelf->GetVisibleItemsBoundsInScreen();
 }
 
 gfx::Rect FirstRunHelperImpl::GetAppListButtonBounds() {
-  ash::Launcher* launcher = ash::Launcher::ForPrimaryDisplay();
-  views::View* app_button = launcher->GetAppListButtonView();
+  Shelf* shelf = Shelf::ForPrimaryDisplay();
+  views::View* app_button = shelf->GetAppListButtonView();
   return app_button->GetBoundsInScreen();
 }
 
@@ -120,4 +120,3 @@ gfx::Rect FirstRunHelperImpl::GetHelpButtonBounds() {
 }
 
 }  // namespace ash
-