ash: Rename LauncherModel to ShelfModel.

ash/shelf/shelf_widget.cc

 // 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.
 
 #include "ash/shelf/shelf_widget.h"
 
 #include "ash/ash_switches.h"
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher_delegate.h"
-#include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_navigator.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace_controller.h"
 #include "grit/ash_resources.h"
@@ skipping 573 matching lines @@
 
 bool ShelfWidget::GetDimsShelf() const {
   return delegate_view_->GetDimmed();
 }
 
 void ShelfWidget::CreateLauncher() {
   if (launcher_)
     return;
 
   Shell* shell = Shell::GetInstance();
-  // This needs to be called before launcher_model().
+  // This needs to be called before shelf_model().
   LauncherDelegate* launcher_delegate = shell->GetLauncherDelegate();
   if (!launcher_delegate)
     return;  // Not ready to create Launcher
 
-  launcher_.reset(new Launcher(shell->launcher_model(),
+  launcher_.reset(new Launcher(shell->shelf_model(),
                                shell->GetLauncherDelegate(),
                                this));
   SetFocusCycler(shell->focus_cycler());
 
   // Inform the root window controller.
   internal::RootWindowController::ForWindow(window_container_)->
       OnLauncherCreated();
 
   launcher_->SetVisible(
       shell->session_state_delegate()->IsActiveUserSessionStarted());
@@ skipping 50 matching lines @@
     return delegate_view_->GetDimmerBoundsForTest();
   return gfx::Rect();
 }
 
 void ShelfWidget::DisableDimmingAnimationsForTest() {
   DCHECK(delegate_view_);
   return delegate_view_->disable_dimming_animations_for_test();
 }
 
 }  // namespace ash