Renames LauncherID, LauncherItem and LauncherItems...

ash/shelf/shelf_window_watcher.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
 
 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 12 matching lines @@
 }
 
 }  // namespace aura
 
 namespace ash {
 
 class ShelfModel;
 class ShelfItemDelegateManager;
 
 namespace internal {
-// ShelfWindowWatcher creates and handles a LauncherItem for windows that have
+// ShelfWindowWatcher creates and handles a ShelfItem for windows that have
 // a ShelfItemDetails property in the default container.
 class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
                            public aura::WindowObserver,
                            public gfx::DisplayObserver {
  public:
   ShelfWindowWatcher(ShelfModel* model,
                      ShelfItemDelegateManager* item_delegate_manager);
   virtual ~ShelfWindowWatcher();
 
  private:
@@ skipping 24 matching lines @@
     virtual void OnWindowParentChanged(aura::Window* window,
                                        aura::Window* parent) OVERRIDE;
     virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
 
     // Owned by Shell.
     ShelfWindowWatcher* window_watcher_;
 
     DISALLOW_COPY_AND_ASSIGN(RemovedWindowObserver);
   };
 
-  // Creates a LauncherItem for |window| that has ShelfItemDetails.
-  void AddLauncherItem(aura::Window* window);
+  // Creates a ShelfItem for |window| that has ShelfItemDetails.
+  void AddShelfItem(aura::Window* window);
 
-  // Removes a LauncherItem for |window|.
-  void RemoveLauncherItem(aura::Window* window);
+  // Removes a ShelfItem for |window|.
+  void RemoveShelfItem(aura::Window* window);
 
   // Adds observer to default container and ActivationClient of |root_window|.
   void OnRootWindowAdded(aura::Window* root_window);
 
   // Removes observer from ActivationClient of |root_window|.
   void OnRootWindowRemoved(aura::Window* root_window);
 
   // Updates the status of ShelfItem for |window|.
   void UpdateShelfItemStatus(aura::Window* window, bool is_active);
 
-  // Returns the index of LauncherItem associated with |window|.
-  int GetLauncherItemIndexForWindow(aura::Window* window) const;
+  // Returns the index of ShelfItem associated with |window|.
+  int GetShelfItemIndexForWindow(aura::Window* window) const;
 
   // Used when a window is removed. During the dragging a window may be removed
   // and when the drag completes added back. When this happens we don't want to
   // remove the shelf item. StartObservingRemovedWindow, if necessary, attaches
   // an observer. When done, FinishObservingRemovedWindow() is invoked.
   void StartObservingRemovedWindow(aura::Window* window);
 
   // Stop observing |window| by RemovedWindowObserver and remove an item
   // associated with |window|.
   void FinishObservingRemovedWindow(aura::Window* window);
@@ skipping 36 matching lines @@
   ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
       aura::client::ActivationChangeObserver> observed_activation_clients_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WINDOW_WATCHER_H_