Rename Launcher to Shelf.

ash/shelf/shelf_window_watcher.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_window_watcher.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
 // Sets LauncherItem property by using the value of |details|.
-void SetLauncherItemDetailsForLauncherItem(
+void SetShelfItemDetailsForLauncherItem(
     ash::LauncherItem* item,
     const ash::LauncherItemDetails& details) {
   item->type = details.type;
   if (details.image_resource_id != ash::kInvalidImageResourceID) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     item->image = *rb.GetImageSkiaNamed(details.image_resource_id);
   }
 }
 
 // Returns true if |window| has a LauncherItem added by ShelfWindowWatcher.
@@ skipping 44 matching lines @@
 ShelfWindowWatcher::~ShelfWindowWatcher() {
   Shell::GetScreen()->RemoveObserver(this);
 }
 
 void ShelfWindowWatcher::AddLauncherItem(aura::Window* window) {
   const LauncherItemDetails* item_details =
       GetLauncherItemDetailsForWindow(window);
   LauncherItem item;
   LauncherID id = model_->next_id();
   item.status = ash::wm::IsActiveWindow(window) ? STATUS_ACTIVE: STATUS_RUNNING;
-  SetLauncherItemDetailsForLauncherItem(&item, *item_details);
+  SetShelfItemDetailsForLauncherItem(&item, *item_details);
   SetLauncherIDForWindow(id, window);
   scoped_ptr<ShelfItemDelegate> item_delegate(
       new ShelfWindowWatcherItemDelegate(window));
   // |item_delegate| is owned by |item_delegate_manager_|.
   item_delegate_manager_->SetShelfItemDelegate(id, item_delegate.Pass());
   model_->Add(item);
 }
 
 void ShelfWindowWatcher::RemoveLauncherItem(aura::Window* window) {
   model_->RemoveItemAt(model_->ItemIndexByID(GetLauncherIDForWindow(window)));
@@ skipping 82 matching lines @@
     return;
   }
 
   // When LauncherItemDetails is changed, update LauncherItem.
   if (HasLauncherItemForWindow(window)) {
     int index = GetLauncherItemIndexForWindow(window);
     DCHECK_GE(index, 0);
     LauncherItem item = model_->items()[index];
     const LauncherItemDetails* details =
         GetLauncherItemDetailsForWindow(window);
-    SetLauncherItemDetailsForLauncherItem(&item, *details);
+    SetShelfItemDetailsForLauncherItem(&item, *details);
     model_->Set(index, item);
     return;
   }
 
   // Creates a new LauncherItem for |window|.
   AddLauncherItem(window);
 }
 
 void ShelfWindowWatcher::OnDisplayBoundsChanged(const gfx::Display& display) {
 }
@@ skipping 11 matching lines @@
 
 void ShelfWindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
   // When this is called, RootWindow of |old_display| is already removed.
   // Instead, we remove an observer from RootWindow and ActivationClient in the
   // OnRootWindowDestroyed().
   // Do nothing here.
 }
 
 }  // namespace internal
 }  // namespace ash