Rename Launcher to Shelf.

ash/wm/panels/panel_layout_manager.h

 // 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.
 
 #ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 #define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
 
 #include <list>
 
 #include "ash/ash_export.h"
@@ skipping 19 matching lines @@
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
-class Launcher;
+class Shelf;
 
 namespace internal {
 class PanelCalloutWidget;
 class ShelfLayoutManager;
 
 // PanelLayoutManager is responsible for organizing panels within the
 // workspace. It is associated with a specific container window (i.e.
 // kShellWindowId_PanelContainer) and controls the layout of any windows
 // added to that container.
 //
@@ skipping 19 matching lines @@
   void Shutdown();
 
   void StartDragging(aura::Window* panel);
   void FinishDragging();
 
   void ToggleMinimize(aura::Window* panel);
 
   // Returns the callout widget (arrow) for |panel|.
   views::Widget* GetCalloutWidgetForPanel(aura::Window* panel);
 
-  ash::Launcher* launcher() { return launcher_; }
-  void SetLauncher(ash::Launcher* launcher);
+  Shelf* shelf() { return shelf_; }
+  void SetShelf(Shelf* shelf);
 
   // Overridden from 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,
                               const gfx::Rect& requested_bounds) OVERRIDE;
@@ skipping 73 matching lines @@
   // Parent window associated with this layout manager.
   aura::Window* panel_container_;
   // Protect against recursive calls to OnWindowAddedToLayout().
   bool in_add_window_;
   // Protect against recursive calls to Relayout().
   bool in_layout_;
   // Ordered list of unowned pointers to panel windows.
   PanelList panel_windows_;
   // The panel being dragged.
   aura::Window* dragged_panel_;
-  // The launcher we are observing for launcher icon changes.
-  Launcher* launcher_;
+  // The shelf we are observing for shelf icon changes.
+  Shelf* shelf_;
   // The shelf layout manager being observed for visibility changes.
   ShelfLayoutManager* shelf_layout_manager_;
 
   // When not NULL, the shelf is hidden (i.e. full screen) and this tracks the
   // set of panel windows which have been temporarily hidden and need to be
   // restored when the shelf becomes visible again.
   scoped_ptr<aura::WindowTracker> restore_windows_on_shelf_visible_;
 
   // The last active panel. Used to maintain stacking order even if no panels
   // are currently focused.
   aura::Window* last_active_panel_;
   base::WeakPtrFactory<PanelLayoutManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_