Remove Shell::shelf()|status_area_widget()|launcher()

ash/wm/shelf_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_SHELF_LAYOUT_MANAGER_H_
 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/timer.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 class RootWindow;
 }
 
 namespace ui {
 class GestureEvent;
 }
 
-namespace views {
-class Widget;
-}
-
 namespace ash {
 class ScreenAsh;
 namespace internal {
 
 class ShelfLayoutManagerTest;
+class StatusAreaWidget;
 class WorkspaceController;
 
 // ShelfLayoutManager is the layout manager responsible for the launcher and
 // status widgets. The launcher is given the total available width and told the
 // width of the status area. This allows the launcher to draw the background and
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
 class ASH_EXPORT ShelfLayoutManager :
     public aura::LayoutManager,
@@ skipping 32 matching lines @@
   // the bottom-of-window resize handle can be hit.
   // TODO(jamescook): Some day we may want the workspace area to be an even
   // multiple of the size of the grid (currently 8 pixels), which will require
   // removing this and finding a way for hover and click events to pass through
   // the invisible parts of the launcher.
   static const int kWorkspaceAreaBottomInset;
 
   // Size of the shelf when auto-hidden.
   static const int kAutoHideSize;
 
-  explicit ShelfLayoutManager(views::Widget* status);
+  explicit ShelfLayoutManager(StatusAreaWidget* status);
   virtual ~ShelfLayoutManager();
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   void SetAutoHideBehavior(ShelfAutoHideBehavior behavior);
   ShelfAutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
   // Sets the alignment. Returns true if the alignment is changed. Otherwise,
   // returns false.
   bool SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
 
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
   views::Widget* launcher_widget() {
     return launcher_ ? launcher_->widget() : NULL;
   }
   const views::Widget* launcher_widget() const {
     return launcher_ ? launcher_->widget() : NULL;
   }
-  views::Widget* status() { return status_; }
+  StatusAreaWidget* status_area_widget() { return status_area_widget_; }
 
   bool in_layout() const { return in_layout_; }
 
   // Returns whether the shelf and its contents (launcher, status) are visible
   // on the screen.
   bool IsVisible() const;
 
   // The launcher is typically created after the layout manager.
   void SetLauncher(Launcher* launcher);
   Launcher* launcher() { return launcher_; }
@@ skipping 144 matching lines @@
 
   // See description above setter.
   ShelfAutoHideBehavior auto_hide_behavior_;
 
   ShelfAlignment alignment_;
 
   // Current state.
   State state_;
 
   Launcher* launcher_;
-  views::Widget* status_;
+  StatusAreaWidget* status_area_widget_;
 
   WorkspaceController* workspace_controller_;
 
   // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
   bool window_overlaps_shelf_;
 
   base::OneShotTimer<ShelfLayoutManager> auto_hide_timer_;
 
   // EventFilter used to detect when user moves the mouse over the launcher to
   // trigger showing the launcher.
@@ skipping 22 matching lines @@
   // Used to delay updating shelf background.
   UpdateShelfObserver* update_shelf_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_SHELF_LAYOUT_MANAGER_H_