Refactor: Shelf Widget

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 10 matching lines @@
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/app_list_controller.h"
@@ skipping 658 matching lines @@
     (*iter)->UpdateAfterLoginStatusChange(status);
 }
 
 void Shell::OnAppTerminating() {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnAppTerminating());
 }
 
 void Shell::OnLockStateChanged(bool locked) {
   FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked));
 }
-
 void Shell::CreateLauncher() {
   if (IsLauncherPerDisplayEnabled()) {
     RootWindowControllerList controllers = GetAllRootWindowControllers();
     for (RootWindowControllerList::iterator iter = controllers.begin();
-         iter != controllers.end(); ++iter)
-      (*iter)->CreateLauncher();
+        iter != controllers.end(); ++iter)
+      (*iter)->shelf()->CreateLauncher();
   } else {
-    GetPrimaryRootWindowController()->CreateLauncher();
+    GetPrimaryRootWindowController()->shelf()->CreateLauncher();
   }
 }
 
 void Shell::ShowLauncher() {
   if (IsLauncherPerDisplayEnabled()) {
     RootWindowControllerList controllers = GetAllRootWindowControllers();
     for (RootWindowControllerList::iterator iter = controllers.begin();
-         iter != controllers.end(); ++iter)
+        iter != controllers.end(); ++iter)
       (*iter)->ShowLauncher();
   } else {
     GetPrimaryRootWindowController()->ShowLauncher();
   }
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void Shell::UpdateShelfVisibility() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     if ((*iter)->shelf())
       (*iter)->UpdateShelfVisibility();
 }
 
 void Shell::SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
                                      aura::RootWindow* root_window) {
-  GetRootWindowController(root_window)->SetShelfAutoHideBehavior(behavior);
+  ash::internal::ShelfLayoutManager::ForLauncher(root_window)->
+      SetAutoHideBehavior(behavior);
 }
 
 ShelfAutoHideBehavior Shell::GetShelfAutoHideBehavior(
     aura::RootWindow* root_window) const {
-  return GetRootWindowController(root_window)->GetShelfAutoHideBehavior();
+  return ash::internal::ShelfLayoutManager::ForLauncher(root_window)->
+      auto_hide_behavior();
 }
 
 void Shell::SetShelfAlignment(ShelfAlignment alignment,
                               aura::RootWindow* root_window) {
-  if (GetRootWindowController(root_window)->SetShelfAlignment(alignment)) {
+  if (ash::internal::ShelfLayoutManager::ForLauncher(root_window)->
+      SetAlignment(alignment)) {
     FOR_EACH_OBSERVER(
         ShellObserver, observers_, OnShelfAlignmentChanged(root_window));
   }
 }
 
 ShelfAlignment Shell::GetShelfAlignment(aura::RootWindow* root_window) {
-  return GetRootWindowController(root_window)->GetShelfAlignment();
+  return GetRootWindowController(root_window)->
+      shelf_layout_manager()->GetAlignment();
 }
 
 void Shell::SetDimming(bool should_dim) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     (*iter)->screen_dimmer()->SetDimming(should_dim);
 }
 
 void Shell::CreateModalBackground(aura::Window* window) {
@@ skipping 18 matching lines @@
   if (!activated) {
     RemovePreTargetHandler(modality_filter_.get());
     modality_filter_.reset();
     for (RootWindowControllerList::iterator iter = controllers.begin();
          iter != controllers.end(); ++iter)
       (*iter)->GetSystemModalLayoutManager(removed)->DestroyModalBackground();
   }
 }
 
 WebNotificationTray* Shell::GetWebNotificationTray() {
-  return GetPrimaryRootWindowController()->status_area_widget()->
-      web_notification_tray();
+  return GetPrimaryRootWindowController()->shelf()->
+      status_area_widget()->web_notification_tray();
 }
 
 bool Shell::HasPrimaryStatusArea() {
-  return !!GetPrimaryRootWindowController()->status_area_widget();
+  return !!GetPrimaryRootWindowController()->
+      shelf()->status_area_widget();
 }
 
 SystemTray* Shell::GetPrimarySystemTray() {
   return GetPrimaryRootWindowController()->GetSystemTray();
 }
 
 LauncherDelegate* Shell::GetLauncherDelegate() {
   if (!launcher_delegate_.get()) {
     launcher_model_.reset(new LauncherModel);
     launcher_delegate_.reset(
@@ skipping 117 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash