ash: Rename LauncherModel to ShelfModel.

ash/shell.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 69 matching lines @@
 class AutoclickController;
 class CapsLockDelegate;
 class DesktopBackgroundController;
 class DisplayController;
 class FirstRunHelper;
 class HighContrastController;
 class Launcher;
 class LauncherDelegate;
 class LauncherItemDelegate;
 class LauncherItemDelegateManager;
-class LauncherModel;
 class LockStateController;
 class MagnificationController;
 class MediaDelegate;
 class MruWindowTracker;
 class NestedDispatcherController;
 class NewWindowDelegate;
 class PartialMagnificationController;
 class PowerButtonController;
 class RootWindowHostFactory;
 class ScreenAsh;
 class SessionStateDelegate;
+class ShelfModel;
 class ShellDelegate;
 class ShellObserver;
 class StickyKeys;
 class SystemTray;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
 class UserActivityDetector;
 class UserWallpaperDelegate;
 class VideoDetector;
 class WebNotificationTray;
@@ skipping 376 matching lines @@
 
   internal::ResolutionNotificationController*
       resolution_notification_controller() {
     return resolution_notification_controller_.get();
   }
 
   RootWindowHostFactory* root_window_host_factory() {
     return root_window_host_factory_.get();
   }
 
-  LauncherModel* launcher_model() {
-    return launcher_model_.get();
+  ShelfModel* shelf_model() {
+    return shelf_model_.get();
   }
 
   WindowPositioner* window_positioner() {
     return window_positioner_.get();
   }
 
   // Returns the launcher delegate, creating if necesary.
   LauncherDelegate* GetLauncherDelegate();
 
   void SetTouchHudProjectionEnabled(bool enabled);
@@ skipping 75 matching lines @@
   scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
   scoped_ptr<SessionStateDelegate> session_state_delegate_;
   scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
   scoped_ptr<NewWindowDelegate> new_window_delegate_;
   scoped_ptr<MediaDelegate> media_delegate_;
   scoped_ptr<LauncherDelegate> launcher_delegate_;
   scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
 
-  scoped_ptr<LauncherModel> launcher_model_;
-  scoped_ptr<ash::WindowPositioner> window_positioner_;
+  scoped_ptr<ShelfModel> shelf_model_;
+  scoped_ptr<WindowPositioner> window_positioner_;
 
   scoped_ptr<internal::AppListController> app_list_controller_;
 
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<views::corewm::ShadowController> shadow_controller_;
   scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
   scoped_ptr<views::corewm::WindowModalityController>
       window_modality_controller_;
   scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
@@ skipping 79 matching lines @@
   bool simulate_modal_window_open_for_testing_;
 
   bool is_touch_hud_projection_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_