Rename Launcher to Shelf.

ash/wm/dock/docked_window_layout_manager.h

 // Copyright (c) 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_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 #define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shell_observer.h"
@@ skipping 20 matching lines @@
 
 namespace gfx {
 class Point;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
-class Launcher;
+class Shelf;
 
 namespace internal {
 class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
 class ShelfLayoutManager;
 class WorkspaceController;
 
 struct WindowWithHeight {
   explicit WindowWithHeight(aura::Window* window) :
@@ skipping 51 matching lines @@
   void DockDraggedWindow(aura::Window* window);
 
   // Called by a DockedWindowResizer when a dragged window is no longer docked.
   void UndockDraggedWindow();
 
   // Called by a DockedWindowResizer when a window is no longer being dragged.
   // Stops observing the window unless it is a child.
   // Records |action| by |source| in UMA.
   void FinishDragging(DockedAction action, DockedActionSource source);
 
-  ash::Launcher* launcher() { return launcher_; }
-  void SetLauncher(ash::Launcher* launcher);
+  Shelf* shelf() { return shelf_; }
+  void SetShelf(Shelf* shelf);
 
   // Calculates if a window is touching the screen edges and returns edge.
   DockedAlignment GetAlignmentOfWindow(const aura::Window* window) const;
 
   // Used to snap docked windows to the side of screen during drag.
   DockedAlignment CalculateAlignment() const;
 
   // Returns true when a window can be docked. Windows cannot be docked at the
-  // edge used by the launcher shelf or the edge opposite from existing dock.
+  // edge used by the shelf or the edge opposite from existing dock.
   bool CanDockWindow(aura::Window* window, SnapType edge);
 
   aura::Window* dock_container() const { return dock_container_; }
 
   // Returns current bounding rectangle of docked windows area.
   const gfx::Rect& docked_bounds() const { return docked_bounds_; }
 
   // Returns last known coordinates of |dragged_window_| after Relayout.
   const gfx::Rect dragged_bounds() const { return dragged_bounds_;}
 
   // Returns true if currently dragged window is docked at the screen edge.
   bool is_dragged_window_docked() const { return is_dragged_window_docked_; }
 
-  // Updates docked layout when launcher shelf bounds change.
+  // Updates docked layout when shelf bounds change.
   void OnShelfBoundsChanged();
 
   // aura::LayoutManager:
   virtual void OnWindowResized() OVERRIDE;
   virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE;
   virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
   virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE;
   virtual void OnChildWindowVisibilityChanged(aura::Window* child,
                                               bool visibile) OVERRIDE;
   virtual void SetChildBounds(aura::Window* child,
@@ skipping 109 matching lines @@
   aura::Window* dragged_window_;
 
   // True if the window being dragged is currently docked.
   bool is_dragged_window_docked_;
 
   // Previously docked windows use a more relaxed dragging sorting algorithm
   // that uses assumption that a window starts being dragged out of position
   // that was previously established in Relayout. This allows easier reordering.
   bool is_dragged_from_dock_;
 
-  // The launcher to respond to launcher alignment changes.
-  Launcher* launcher_;
+  // The shelf to respond to alignment changes.
+  Shelf* shelf_;
 
   // Workspace controller that can be checked for fullscreen mode.
   WorkspaceController* workspace_controller_;
   // Tracks if any window in the same root window is in fullscreen mode.
   bool in_fullscreen_;
   // Current width of the dock.
   int docked_width_;
 
   // Last bounds that were sent to observers.
   gfx::Rect docked_bounds_;
 
   // Target bounds of a docked window being dragged.
   gfx::Rect dragged_bounds_;
 
   // Side of the screen that the dock is positioned at.
   DockedAlignment alignment_;
 
   // The last active window. Used to maintain stacking order even if no windows
   // are currently focused.
   aura::Window* last_active_window_;
 
   // Timestamp of the last user-initiated action that changed docked state.
   // Used in UMA metrics.
   base::Time last_action_time_;
 
-  // Observes launcher shelf for bounds changes.
+  // Observes shelf for bounds changes.
   scoped_ptr<ShelfWindowObserver> shelf_observer_;
 
   // Widget used to paint a background for the docked area.
   scoped_ptr<DockedBackgroundWidget> background_widget_;
 
   // Observers of dock bounds changes.
   ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_