ash: Rename LauncherModel to ShelfModel.

ash/shelf/shelf_view.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 "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
-#include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
 #include "ash/scoped_target_root_window.h"
 #include "ash/shelf/alternate_app_list_button.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/overflow_bubble.h"
 #include "ash/shelf/overflow_button.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_delegate.h"
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ skipping 333 matching lines @@
     view_->layer()->SetOpacity(1.0f);
   }
 
  private:
   ShelfView* shelf_view_;
   views::View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate);
 };
 
-ShelfView::ShelfView(LauncherModel* model,
+ShelfView::ShelfView(ShelfModel* model,
                      LauncherDelegate* delegate,
                      ShelfLayoutManager* shelf_layout_manager)
     : model_(model),
       delegate_(delegate),
       view_model_(new views::ViewModel),
       first_visible_index_(0),
       last_visible_index_(-1),
       overflow_button_(NULL),
       owner_overflow_bubble_(NULL),
       drag_pointer_(NONE),
@@ skipping 48 matching lines @@
   UpdateFirstButtonPadding();
 
   // We'll layout when our bounds change.
 }
 
 void ShelfView::OnShelfAlignmentChanged() {
   UpdateFirstButtonPadding();
   overflow_button_->OnShelfAlignmentChanged();
   LayoutToIdealBounds();
   for (int i=0; i < view_model_->view_size(); ++i) {
-    // TODO: remove when AppIcon is a Launcher Button.
+    // TODO: remove when AppIcon is a Shelf Button.
     if (TYPE_APP_LIST == model_->items()[i].type &&
         !ash::switches::UseAlternateShelfLayout()) {
       static_cast<AppListButton*>(view_model_->view_at(i))->SetImageAlignment(
           layout_manager_->SelectValueForShelfAlignment(
               views::ImageButton::ALIGN_CENTER,
               views::ImageButton::ALIGN_LEFT,
               views::ImageButton::ALIGN_RIGHT,
               views::ImageButton::ALIGN_CENTER),
           layout_manager_->SelectValueForShelfAlignment(
               views::ImageButton::ALIGN_TOP,
@@ skipping 1001 matching lines @@
     base::AutoReset<bool> cancelling_drag(
         &cancelling_drag_model_changed_, true);
     model_index = CancelDrag(model_index);
   }
   views::View* view = view_model_->view_at(model_index);
   view_model_->Remove(model_index);
 
   // When the overflow bubble is visible, the overflow range needs to be set
   // before CalculateIdealBounds() gets called. Otherwise CalculateIdealBounds()
   // could trigger a LauncherItemChanged() by hiding the overflow bubble and
-  // since the overflow bubble is not yet synced with the LauncherModel this
+  // since the overflow bubble is not yet synced with the ShelfModel this
   // could cause a crash.
   if (overflow_bubble_ && overflow_bubble_->IsShowing()) {
     last_hidden_index_ = std::min(last_hidden_index_,
                                   view_model_->view_size() - 1);
     UpdateOverflowRange(overflow_bubble_->shelf_view());
   }
 
   if (view->visible()) {
     // The first animation fades out the view. When done we'll animate the rest
     // of the views to their target location.
@@ skipping 29 matching lines @@
     AddChildView(new_view);
     view_model_->Add(new_view, model_index);
     view_model_->set_ideal_bounds(model_index, old_ideal_bounds);
     new_view->SetBoundsRect(old_view->bounds());
     return;
   }
 
   views::View* view = view_model_->view_at(model_index);
   switch (item.type) {
     case TYPE_BROWSER_SHORTCUT:
-      // Fallthrough for the new Launcher since it needs to show the activation
+      // Fallthrough for the new Shelf since it needs to show the activation
       // change as well.
     case TYPE_APP_SHORTCUT:
     case TYPE_WINDOWED_APP:
     case TYPE_PLATFORM_APP:
     case TYPE_APP_PANEL: {
       LauncherButton* button = static_cast<LauncherButton*>(view);
       ReflectItemStatus(item, button);
       // The browser shortcut is currently not a "real" item and as such the
       // the image is bogous as well. We therefore keep the image as is for it.
       if (item.type != TYPE_BROWSER_SHORTCUT)
@@ skipping 15 matching lines @@
   // at this time the |view_model_| is inconsistent with the |model_|.
   if (!cancelling_drag_model_changed_)
     AnimateToIdealBounds();
 }
 
 void ShelfView::ShelfStatusChanged() {
   if (ash::switches::UseAlternateShelfLayout())
     return;
   AppListButton* app_list_button =
       static_cast<AppListButton*>(GetAppListButtonView());
-  if (model_->status() == LauncherModel::STATUS_LOADING)
+  if (model_->status() == ShelfModel::STATUS_LOADING)
     app_list_button->StartLoadingAnimation();
   else
     app_list_button->StopLoadingAnimation();
 }
 
 void ShelfView::PointerPressedOnButton(views::View* view,
                                        Pointer pointer,
                                        const ui::LocatedEvent& event) {
   if (drag_view_)
     return;
@@ skipping 219 matching lines @@
     anchor_point = source->GetBoundsInScreen();
 
     // It is possible to invoke the menu while it is sliding into view. To cover
     // that case, the screen coordinates are offsetted by the animation delta.
     gfx::Vector2d offset =
         source->GetWidget()->GetNativeWindow()->bounds().origin() -
         source->GetWidget()->GetNativeWindow()->GetTargetBounds().origin();
     anchor_point.set_x(anchor_point.x() - offset.x());
     anchor_point.set_y(anchor_point.y() - offset.y());
 
-    // Launcher items can have an asymmetrical border for spacing reasons.
+    // Shelf items can have an asymmetrical border for spacing reasons.
     // Adjust anchor location for this.
     if (source->border())
       anchor_point.Inset(source->border()->GetInsets());
 
     switch (align) {
       case ash::SHELF_ALIGNMENT_BOTTOM:
         menu_alignment = views::MenuItemView::BUBBLE_ABOVE;
         break;
       case ash::SHELF_ALIGNMENT_LEFT:
         menu_alignment = views::MenuItemView::BUBBLE_RIGHT;
@@ skipping 119 matching lines @@
       break;
     case ash::SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace internal
 }  // namespace ash