ash: Rename LauncherIconObserver to ShelfIconObserver.

ash/shelf/shelf_view_unittest.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_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
-#include "ash/launcher/launcher_icon_observer.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/shelf_icon_observer.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_tooltip_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
@@ skipping 12 matching lines @@
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/views/view_model.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
-// LauncherIconObserver tests.
+// ShelfIconObserver tests.
 
-class TestLauncherIconObserver : public LauncherIconObserver {
+class TestShelfIconObserver : public ShelfIconObserver {
  public:
-  explicit TestLauncherIconObserver(Launcher* launcher)
+  explicit TestShelfIconObserver(Launcher* launcher)
       : launcher_(launcher),
         change_notified_(false) {
     if (launcher_)
       launcher_->AddIconObserver(this);
   }
 
-  virtual ~TestLauncherIconObserver() {
+  virtual ~TestShelfIconObserver() {
     if (launcher_)
       launcher_->RemoveIconObserver(this);
   }
 
-  // LauncherIconObserver implementation.
-  virtual void OnLauncherIconPositionsChanged() OVERRIDE {
+  // ShelfIconObserver implementation.
+  virtual void OnShelfIconPositionsChanged() OVERRIDE {
     change_notified_ = true;
   }
 
   int change_notified() const { return change_notified_; }
   void Reset() { change_notified_ = false; }
 
  private:
   Launcher* launcher_;
   bool change_notified_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestLauncherIconObserver);
+  DISALLOW_COPY_AND_ASSIGN(TestShelfIconObserver);
 };
 
 class ShelfViewIconObserverTest : public ash::test::AshTestBase {
  public:
   ShelfViewIconObserverTest() {}
   virtual ~ShelfViewIconObserverTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     Launcher* launcher = Launcher::ForPrimaryDisplay();
-    observer_.reset(new TestLauncherIconObserver(launcher));
+    observer_.reset(new TestShelfIconObserver(launcher));
 
     shelf_view_test_.reset(new ShelfViewTestAPI(
         LauncherTestAPI(launcher).shelf_view()));
     shelf_view_test_->SetAnimationDuration(1);
   }
 
   virtual void TearDown() OVERRIDE {
     observer_.reset();
     AshTestBase::TearDown();
   }
 
-  TestLauncherIconObserver* observer() { return observer_.get(); }
+  TestShelfIconObserver* observer() { return observer_.get(); }
 
   ShelfViewTestAPI* shelf_view_test() {
     return shelf_view_test_.get();
   }
 
   Launcher* LauncherForSecondaryDisplay() {
     return Launcher::ForWindow(Shell::GetAllRootWindows()[1]);
   }
 
  private:
-  scoped_ptr<TestLauncherIconObserver> observer_;
+  scoped_ptr<TestShelfIconObserver> observer_;
   scoped_ptr<ShelfViewTestAPI> shelf_view_test_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfViewIconObserverTest);
 };
 
 TEST_F(ShelfViewIconObserverTest, AddRemove) {
   ash::test::TestLauncherDelegate* launcher_delegate =
       ash::test::TestLauncherDelegate::instance();
   ASSERT_TRUE(launcher_delegate);
 
@@ skipping 21 matching lines @@
 #define MAYBE_AddRemoveWithMultipleDisplays \
     DISABLED_AddRemoveWithMultipleDisplays
 #else
 #define MAYBE_AddRemoveWithMultipleDisplays \
     AddRemoveWithMultipleDisplays
 #endif
 // Make sure creating/deleting an window on one displays notifies a
 // launcher on external display as well as one on primary.
 TEST_F(ShelfViewIconObserverTest, MAYBE_AddRemoveWithMultipleDisplays) {
   UpdateDisplay("400x400,400x400");
-  TestLauncherIconObserver second_observer(LauncherForSecondaryDisplay());
+  TestShelfIconObserver second_observer(LauncherForSecondaryDisplay());
 
   ash::test::TestLauncherDelegate* launcher_delegate =
       ash::test::TestLauncherDelegate::instance();
   ASSERT_TRUE(launcher_delegate);
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.context = CurrentContext();
 
@@ skipping 1207 matching lines @@
   test_api_->RunMessageLoopUntilAnimationsDone();
   CheckAllItemsAreInBounds();
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool());
 INSTANTIATE_TEST_CASE_P(VisibleBounds, ShelfViewVisibleBoundsTest,
     testing::Bool());
 
 }  // namespace test
 }  // namespace ash