Renames LauncherID, LauncherItem and LauncherItems...

ash/shelf/shelf.cc

 // Copyright 2013 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.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/focus_cycler.h"
@@ skipping 64 matching lines @@
   return shelf_widget ? shelf_widget->shelf() : NULL;
 }
 
 void Shelf::SetAlignment(ShelfAlignment alignment) {
   alignment_ = alignment;
   shelf_view_->OnShelfAlignmentChanged();
   // ShelfLayoutManager will resize the shelf.
 }
 
 gfx::Rect Shelf::GetScreenBoundsOfItemIconForWindow(aura::Window* window) {
-  LauncherID id = GetLauncherIDForWindow(window);
+  ShelfID id = GetShelfIDForWindow(window);
   gfx::Rect bounds(shelf_view_->GetIdealBoundsOfItemIcon(id));
   gfx::Point screen_origin;
   views::View::ConvertPointToScreen(shelf_view_, &screen_origin);
   return gfx::Rect(screen_origin.x() + bounds.x(),
                    screen_origin.y() + bounds.y(),
                    bounds.width(),
                    bounds.height());
 }
 
 void Shelf::UpdateIconPositionForWindow(aura::Window* window) {
   shelf_view_->UpdatePanelIconPosition(
-      GetLauncherIDForWindow(window),
+      GetShelfIDForWindow(window),
       ScreenUtil::ConvertRectFromScreen(
           shelf_widget()->GetNativeView(),
           window->GetBoundsInScreen()).CenterPoint());
 }
 
 void Shelf::ActivateShelfItem(int index) {
   // We pass in a keyboard event which will then trigger a switch to the
   // next item if the current one is already active.
   ui::KeyEvent event(ui::ET_KEY_RELEASED,
                      ui::VKEY_UNKNOWN,  // The actual key gets ignored.
                      ui::EF_NONE,
                      false);
 
-  const LauncherItem& item = shelf_view_->model()->items()[index];
+  const ShelfItem& item = shelf_view_->model()->items()[index];
   ShelfItemDelegate* item_delegate =
       Shell::GetInstance()->shelf_item_delegate_manager()->GetShelfItemDelegate(
           item.id);
   item_delegate->ItemSelected(event);
 }
 
 void Shelf::CycleWindowLinear(CycleDirection direction) {
   int item_index = GetNextActivatedItemIndex(
       *(shelf_view_->model()), direction);
   if (item_index >= 0)
@@ skipping 27 matching lines @@
 void Shelf::SchedulePaint() {
   shelf_view_->SchedulePaintForAllButtons();
 }
 
 views::View* Shelf::GetAppListButtonView() const {
   return shelf_view_->GetAppListButtonView();
 }
 
 void Shelf::LaunchAppIndexAt(int item_index) {
   ShelfModel* shelf_model = shelf_view_->model();
-  const LauncherItems& items = shelf_model->items();
+  const ShelfItems& items = shelf_model->items();
   int item_count = shelf_model->item_count();
   int indexes_left = item_index >= 0 ? item_index : item_count;
   int found_index = -1;
 
   // Iterating until we have hit the index we are interested in which
   // is true once indexes_left becomes negative.
   for (int i = 0; i < item_count && indexes_left >= 0; i++) {
     if (items[i].type != TYPE_APP_LIST) {
       found_index = i;
       indexes_left--;
@@ skipping 19 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash