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

2 files changed, 2 insertions, 2 deletions

diff --git a/ash/system/chromeos/brightness/tray_brightness.cc b/ash/system/chromeos/brightness/tray_brightness.cc
index 98cace08..dcce3c1 100644
--- a/ash/system/chromeos/brightness/tray_brightness.cc
+++ b/ash/system/chromeos/brightness/tray_brightness.cc
@@ -201,7 +201,7 @@ bool TrayBrightness::ShouldHideArrow() const {
   return true;
 }
 
-bool TrayBrightness::ShouldShowLauncher() const {
+bool TrayBrightness::ShouldShowShelf() const {
   return false;
 }
 
diff --git a/ash/system/chromeos/brightness/tray_brightness.h b/ash/system/chromeos/brightness/tray_brightness.h
index adabbc5..0c15a75 100644
--- a/ash/system/chromeos/brightness/tray_brightness.h
+++ b/ash/system/chromeos/brightness/tray_brightness.h
@@ -42,7 +42,7 @@ class TrayBrightness : public SystemTrayItem,
   virtual void DestroyDetailedView() OVERRIDE;
   virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
   virtual bool ShouldHideArrow() const OVERRIDE;
-  virtual bool ShouldShowLauncher() const OVERRIDE;
+  virtual bool ShouldShowShelf() const OVERRIDE;
 
   // Overriden from PowerManagerClient::Observer.
   virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE;