Refactor: Shelf Widget

ash/root_window_controller.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_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
 #include "ash/ash_export.h"
-#include "ash/shelf_types.h"
+#include "ash/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
 class SkBitmap;
 
 namespace aura {
 class EventFilter;
 class RootWindow;
 class Window;
 }
 
 namespace gfx {
 class Point;
 }
 
 namespace views {
 namespace corewm {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
 }
 }
 
 namespace ash {
-class Launcher;
 class StackingController;
+class ShelfWidget;
 class SystemTray;
 class ToplevelWindowEventHandler;
 
 namespace internal {
 
 class BootSplashScreen;
 class PanelLayoutManager;
 class RootWindowLayoutManager;
 class ScreenDimmer;
 class ShelfLayoutManager;
@@ skipping 27 matching lines @@
   aura::RootWindow* root_window() { return root_window_.get(); }
 
   RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
 
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); }
 
-  Launcher* launcher() { return launcher_.get(); }
+  // Access the shelf associated with this root window controller,
+  // NULL if no such shelf exists.
+  ShelfWidget* shelf() const { return shelf_.get(); }

[James Cook, 2013/03/05 20:30:38]

no const

[Harry McCleave, 2013/03/06 01:59:49]

Done.

 
-  ShelfLayoutManager* shelf() const { return shelf_; }
-
-  StatusAreaWidget* status_area_widget() {
-    return status_area_widget_;
-  }
+  // Access the shelf layout manager associated with this root
+  // window controller, NULL if no such shelf exists.
+  ShelfLayoutManager* shelf_layout_manager() const;

[James Cook, 2013/03/05 20:30:38]

inline or GetShelfLayoutManager

[Harry McCleave, 2013/03/06 01:59:49]

Done.

 
   // Returns the system tray on this root window. Note that
   // calling this on the root window that doesn't have a launcher will
   // lead to a crash.
   SystemTray* GetSystemTray();
 
   // Shows context menu at the |location_in_screen|. This uses
   // |ShellDelegate::CreateContextMenu| to define the content of the menu.
   void ShowContextMenu(const gfx::Point& location_in_screen);
 
@@ skipping 13 matching lines @@
   void CreateContainers();
 
   // Initializs the RootWindowController for primary display. This
   // creates
   void InitForPrimaryDisplay();
 
   // Initializes |system_background_| and possibly also |boot_splash_screen_|.
   // |is_first_run_after_boot| determines the background's initial color.
   void CreateSystemBackground(bool is_first_run_after_boot);
 
-  // Initializes |launcher_|.  Does nothing if it's already initialized.
-  void CreateLauncher();
-
   // Show launcher view if it was created hidden (before session has started).
   void ShowLauncher();
 
+  // Called when the launcher associated with this root window is created.
+  void OnLauncherCreated();
+
   // Called when the user logs in.
   void OnLoginStateChanged(user::LoginStatus status);
 
   // Called when the login status changes after login (such as lock/unlock).
   // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
   void UpdateAfterLoginStatusChange(user::LoginStatus status);
 
   // Called when the brightness/grayscale animation from white to the login
   // desktop background image has started.  Starts |boot_splash_screen_|'s
   // hiding animation (if the screen is non-NULL).
@@ skipping 11 matching lines @@
 
   // Deletes all child windows and performs necessary cleanup.
   void CloseChildWindows();
 
   // Moves child windows to |dest|.
   void MoveWindowsTo(aura::RootWindow* dest);
 
   // Force the shelf to query for it's current visibility state.
   void UpdateShelfVisibility();
 
-  // Sets/gets the shelf auto-hide behavior.
-  void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior);
-  ShelfAutoHideBehavior GetShelfAutoHideBehavior() const;
-
-  // Sets/gets the shelf alignemnt.
-  bool SetShelfAlignment(ShelfAlignment alignment);
-  ShelfAlignment GetShelfAlignment();
-
   // Returns true if the active workspace is in immersive mode. Exposed here
   // so clients of Ash don't need to know the details of workspace management.
   bool IsImmersiveMode() const;
 
  private:
   // Creates each of the special window containers that holds windows of various
   // types in the shell UI.
   void CreateContainersInRootWindow(aura::RootWindow* root_window);
 
   scoped_ptr<aura::RootWindow> root_window_;
   RootWindowLayoutManager* root_window_layout_;
 
   scoped_ptr<StackingController> stacking_controller_;
 
-  // Widget containing system tray.
-  StatusAreaWidget* status_area_widget_;
-
   // The shelf for managing the launcher and the status widget.
   // RootWindowController does not own the shelf. Instead, it is owned
   // by container of the status area.
-  ShelfLayoutManager* shelf_;
+  scoped_ptr<ShelfWidget> shelf_;
 
   // Manages layout of panels. Owned by PanelContainer.
   PanelLayoutManager* panel_layout_manager_;
 
-  scoped_ptr<Launcher> launcher_;
-
   scoped_ptr<SystemBackgroundController> system_background_;
   scoped_ptr<BootSplashScreen> boot_splash_screen_;
 
   scoped_ptr<ScreenDimmer> screen_dimmer_;
   scoped_ptr<WorkspaceController> workspace_controller_;
 
   // We need to own event handlers for various containers.
   scoped_ptr<ToplevelWindowEventHandler> default_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> panel_container_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace internal
 }  // ash
 
 #endif  //  ASH_ROOT_WINDOW_CONTROLLER_H_