Refactor: Shelf Widget

ash/shelf/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_

[Mr4D (OOO till 08-26), 2013/03/04 19:18:04]

"WM_" -> "SHELF_"

[Mr4D (OOO till 08-26), 2013/03/04 22:59:00]

I think you have missed this one.

 #define ASH_WM_SHELF_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher.h"
-#include "ash/shelf_types.h"
+#include "ash/shelf/background_animator.h"
+#include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
+#include "ash/system/status_area_widget.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.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 ash {
 class ScreenAsh;
+class ShelfWidget;
 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.
@@ skipping 16 matching lines @@
     virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) {}
   };
 
   // We reserve a small area at the bottom of the workspace area to ensure that
   // the bottom-of-window resize handle can be hit.
   static const int kWorkspaceAreaBottomInset;
 
   // Size of the shelf when auto-hidden.
   static const int kAutoHideSize;
 
-  explicit ShelfLayoutManager(StatusAreaWidget* status);
+  explicit ShelfLayoutManager(ShelfWidget* shelf);
   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 GetAlignment() 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;
-  }
-  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_; }
-
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
 
   // Stops any animations and sets the bounds of the launcher and status
   // widgets.
   void LayoutShelf();
 
   // Returns shelf visibility state based on current value of auto hide
   // behavior setting.
   ShelfVisibilityState CalculateShelfVisibility();
@@ skipping 76 matching lines @@
     return IsHorizontalAlignment() ? horizontal : vertical;
   }
 
   // Is the shelf's alignment horizontal?
   bool IsHorizontalAlignment() const;
 
   // Returns a ShelfLayoutManager on the display which has a launcher for
   // given |window|. See RootWindowController::ForLauncher for more info.
   static ShelfLayoutManager* ForLauncher(aura::Window* window);
 
+  ShelfWidget* shelf_widget() const { return shelf_; }

[Mr4D (OOO till 08-26), 2013/03/04 19:18:04]

New line. Or better: Move up to the other accessor functions (125-126)

[Harry McCleave, 2013/03/04 20:29:24]

Done.

  private:
   class AutoHideEventFilter;
   class UpdateShelfObserver;
   friend class ash::ScreenAsh;
   friend class ShelfLayoutManagerTest;
 
   struct TargetBounds {
     TargetBounds();
 
     float opacity;
-    gfx::Rect launcher_bounds_in_root;
-    gfx::Rect status_bounds_in_root;
+    gfx::Rect shelf_bounds_in_root;
+    gfx::Rect launcher_bounds_in_shelf;
+    gfx::Rect status_bounds_in_shelf;
     gfx::Insets work_area_insets;
   };
 
   struct State {
     State() : visibility_state(SHELF_VISIBLE),
               auto_hide_state(SHELF_AUTO_HIDE_HIDDEN),
               is_screen_locked(false) {}
 
     // Returns true if the two states are considered equal. As
     // |auto_hide_state| only matters if |visibility_state| is
@@ skipping 63 matching lines @@
   bool in_layout_;
 
   // See description above setter.
   ShelfAutoHideBehavior auto_hide_behavior_;
 
   ShelfAlignment alignment_;
 
   // Current state.
   State state_;
 
-  Launcher* launcher_;
-  StatusAreaWidget* status_area_widget_;
+  ShelfWidget* shelf_;
 
   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_