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, 4 insertions, 4 deletions

diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index d4c456a..f63b24c 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -11,12 +11,12 @@
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
-#include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/overflow_bubble.h"
 #include "ash/shelf/shelf_icon_observer.h"
 #include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_tooltip_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ -202,7 +202,7 @@ TEST_F(ShelfViewIconObserverTest, BoundsChanged) {
 // pinned.
 class TestLauncherDelegateForShelfView : public TestLauncherDelegate {
  public:
-  explicit TestLauncherDelegateForShelfView(LauncherModel* model)
+  explicit TestLauncherDelegateForShelfView(ShelfModel* model)
       : TestLauncherDelegate(model) {}
   virtual ~TestLauncherDelegateForShelfView() {}
 
@@ -225,7 +225,7 @@ class ShelfViewTest : public AshTestBase {
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     test::ShellTestApi test_api(Shell::GetInstance());
-    model_ = test_api.launcher_model();
+    model_ = test_api.shelf_model();
     Launcher* launcher = Launcher::ForPrimaryDisplay();
     shelf_view_ = test::LauncherTestAPI(launcher).shelf_view();
 
@@ -421,7 +421,7 @@ class ShelfViewTest : public AshTestBase {
     shelf_view_->tooltip_manager()->ShowInternal();
   }
 
-  LauncherModel* model_;
+  ShelfModel* model_;
   internal::ShelfView* shelf_view_;
   int browser_index_;
   LauncherItemDelegateManager* item_manager_;