ash: Rename LauncherModelObserver to ShelfModelObserver.

ash/launcher/launcher_model.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/launcher/launcher_model.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
-#include "ash/launcher/launcher_model_observer.h"
+#include "ash/shelf/shelf_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int LauncherItemTypeToWeight(LauncherItemType type) {
   if (ash::switches::UseAlternateShelfLayout()) {
     switch (type) {
       case TYPE_APP_LIST:
         // TODO(skuhne): If the app list item becomes movable again, this need
@@ skipping 46 matching lines @@
 }
 
 int LauncherModel::Add(const LauncherItem& item) {
   return AddAt(items_.size(), item);
 }
 
 int LauncherModel::AddAt(int index, const LauncherItem& item) {
   index = ValidateInsertionIndex(item.type, index);
   items_.insert(items_.begin() + index, item);
   items_[index].id = next_id_++;
-  FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
-                    LauncherItemAdded(index));
+  FOR_EACH_OBSERVER(ShelfModelObserver, observers_, ShelfItemAdded(index));
   return index;
 }
 
 void LauncherModel::RemoveItemAt(int index) {
   DCHECK(index >= 0 && index < item_count());
   // The app list and browser shortcut can't be removed.
   DCHECK(items_[index].type != TYPE_APP_LIST &&
          items_[index].type != TYPE_BROWSER_SHORTCUT);
   LauncherID id = items_[index].id;
   items_.erase(items_.begin() + index);
-  FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
-                    LauncherItemRemoved(index, id));
+  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
+                    ShelfItemRemoved(index, id));
 }
 
 void LauncherModel::Move(int index, int target_index) {
   if (index == target_index)
     return;
   // TODO: this needs to enforce valid ranges.
   LauncherItem item(items_[index]);
   items_.erase(items_.begin() + index);
   items_.insert(items_.begin() + target_index, item);
-  FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
-                    LauncherItemMoved(index, target_index));
+  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
+                    ShelfItemMoved(index, target_index));
 }
 
 void LauncherModel::Set(int index, const LauncherItem& item) {
   DCHECK(index >= 0 && index < item_count());
   int new_index = item.type == items_[index].type ?
       index : ValidateInsertionIndex(item.type, index);
 
   LauncherItem old_item(items_[index]);
   items_[index] = item;
   items_[index].id = old_item.id;
-  FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
-                    LauncherItemChanged(index, old_item));
+  FOR_EACH_OBSERVER(ShelfModelObserver, observers_,
+                    ShelfItemChanged(index, old_item));
 
   // If the type changes confirm that the item is still in the right order.
   if (new_index != index) {
     // The move function works by removing one item and then inserting it at the
     // new location. However - by removing the item first the order will change
     // so that our target index needs to be corrected.
     // TODO(skuhne): Moving this into the Move function breaks lots of unit
     // tests. So several functions were already using this incorrectly.
     // That needs to be cleaned up.
     if (index < new_index)
@@ skipping 22 matching lines @@
   weight_dummy.type = TYPE_APP_PANEL;
   return std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                           CompareByWeight) - items_.begin();
 }
 
 void LauncherModel::SetStatus(Status status) {
   if (status_ == status)
     return;
 
   status_ = status;
-  FOR_EACH_OBSERVER(LauncherModelObserver, observers_,
-                    LauncherStatusChanged());
+  FOR_EACH_OBSERVER(ShelfModelObserver, observers_, ShelfStatusChanged());
 }
 
-void LauncherModel::AddObserver(LauncherModelObserver* observer) {
+void LauncherModel::AddObserver(ShelfModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void LauncherModel::RemoveObserver(LauncherModelObserver* observer) {
+void LauncherModel::RemoveObserver(ShelfModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 int LauncherModel::ValidateInsertionIndex(LauncherItemType type,
                                           int index) const {
   DCHECK(index >= 0 && index <= item_count() +
       (ash::switches::UseAlternateShelfLayout() ? 1 : 0));
 
   // Clamp |index| to the allowed range for the type as determined by |weight|.
   LauncherItem weight_dummy;
   weight_dummy.type = type;
   index = std::max(std::lower_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) - items_.begin(),
                    static_cast<LauncherItems::difference_type>(index));
   index = std::min(std::upper_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) - items_.begin(),
                    static_cast<LauncherItems::difference_type>(index));
 
   return index;
 }
 
 }  // namespace ash