ash: Rename LauncherModel to ShelfModel.

* Move launcher_model.* from launcher/ to shelf/
* Rename to shelf_model.*

BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org

Review URL: https://codereview.chromium.org/71653003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235217 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 4 deletions

diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 5415692..61e2eb0 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -42,15 +42,15 @@ class KeyboardControllerProxy;
 
 namespace ash {
 
+class AccessibilityDelegate;
 class CapsLockDelegate;
 class LauncherDelegate;
-class LauncherModel;
 struct LauncherItem;
 class MediaDelegate;
 class NewWindowDelegate;
 class RootWindowHostFactory;
-class AccessibilityDelegate;
 class SessionStateDelegate;
+class ShelfModel;
 class SystemTrayDelegate;
 class UserWallpaperDelegate;
 
@@ -152,8 +152,7 @@ class ASH_EXPORT ShellDelegate {
 
   // Creates a new LauncherDelegate. Shell takes ownership of the returned
   // value.
-  virtual LauncherDelegate* CreateLauncherDelegate(
-      ash::LauncherModel* model) = 0;
+  virtual LauncherDelegate* CreateLauncherDelegate(ShelfModel* model) = 0;
 
   // Creates a system-tray delegate. Shell takes ownership of the delegate.
   virtual SystemTrayDelegate* CreateSystemTrayDelegate() = 0;