Renames LauncherID, LauncherItem and LauncherItems...

ash/shell/window_watcher.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/shell/window_watcher.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 68 matching lines @@
 }
 
 WindowWatcher::~WindowWatcher() {
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++ iter) {
     workspace_window_watcher_->RootWindowRemoved(*iter);
   }
 }
 
-aura::Window* WindowWatcher::GetWindowByID(ash::LauncherID id) {
+aura::Window* WindowWatcher::GetWindowByID(ash::ShelfID id) {
   IDToWindow::const_iterator i = id_to_window_.find(id);
   return i != id_to_window_.end() ? i->second : NULL;
 }
 
 // aura::WindowObserver overrides:
 void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
   if (new_window->type() != ui::wm::WINDOW_TYPE_NORMAL &&
       new_window->type() != ui::wm::WINDOW_TYPE_PANEL)
     return;
 
   static int image_count = 0;
   ShelfModel* model = Shell::GetInstance()->shelf_model();
-  LauncherItem item;
+  ShelfItem item;
   item.type = new_window->type() == ui::wm::WINDOW_TYPE_PANEL
                   ? ash::TYPE_APP_PANEL
                   : ash::TYPE_PLATFORM_APP;
-  ash::LauncherID id = model->next_id();
+  ash::ShelfID id = model->next_id();
   id_to_window_[id] = new_window;
 
   SkBitmap icon_bitmap;
   icon_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
   icon_bitmap.allocPixels();
   icon_bitmap.eraseARGB(255,
                         image_count == 0 ? 255 : 0,
                         image_count == 1 ? 255 : 0,
                         image_count == 2 ? 255 : 0);
   image_count = (image_count + 1) % 3;
   item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap, 1.0f));
 
   model->Add(item);
 
   ShelfItemDelegateManager* manager =
       Shell::GetInstance()->shelf_item_delegate_manager();
   scoped_ptr<ShelfItemDelegate> delegate(
       new WindowWatcherShelfItemDelegate(id, this));
   manager->SetShelfItemDelegate(id, delegate.Pass());
-  SetLauncherIDForWindow(id, new_window);
+  SetShelfIDForWindow(id, new_window);
 }
 
 void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {
   for (IDToWindow::iterator i = id_to_window_.begin();
        i != id_to_window_.end(); ++i) {
     if (i->second == window) {
       ShelfModel* model = Shell::GetInstance()->shelf_model();
       int index = model->ItemIndexByID(i->first);
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
@@ skipping 12 matching lines @@
   workspace_window_watcher_->RootWindowAdded(root);
 }
 
 void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
   // All windows in the display has already been removed, so no need to
   // remove observers.
 }
 
 }  // namespace shell
 }  // namespace ash