Revert 113185 - [cros, Aura] Refresh status area widget bounds on StatusAreaView layout.

ui/aura_shell/shell.cc

 // Copyright (c) 2011 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 "ui/aura_shell/shell.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/desktop.h"
-#include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/aura_shell/app_list.h"
 #include "ui/aura_shell/default_container_event_filter.h"
 #include "ui/aura_shell/default_container_layout_manager.h"
 #include "ui/aura_shell/desktop_event_filter.h"
 #include "ui/aura_shell/desktop_layout_manager.h"
 #include "ui/aura_shell/drag_drop_controller.h"
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/modal_container_layout_manager.h"
 #include "ui/aura_shell/shadow_controller.h"
-#include "ui/aura_shell/shelf_layout_manager.h"
+#include "ui/aura_shell/shelf_layout_controller.h"
 #include "ui/aura_shell/shell_accelerator_controller.h"
 #include "ui/aura_shell/shell_accelerator_filter.h"
 #include "ui/aura_shell/shell_delegate.h"
 #include "ui/aura_shell/shell_factory.h"
 #include "ui/aura_shell/shell_tooltip_manager.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/stacking_controller.h"
-#include "ui/aura_shell/status_area_layout_manager.h"
 #include "ui/aura_shell/toplevel_layout_manager.h"
 #include "ui/aura_shell/toplevel_window_event_filter.h"
 #include "ui/aura_shell/workspace_controller.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace aura_shell {
 
@@ skipping 155 matching lines @@
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
   views::Widget* status_widget = NULL;
   if (delegate_.get())
     status_widget = delegate_->CreateStatusArea();
   if (!status_widget)
     status_widget = internal::CreateStatusArea();
 
-  internal::ShelfLayoutManager* shelf_layout_manager =
-      new internal::ShelfLayoutManager(launcher_->widget(), status_widget);
-  GetContainer(aura_shell::internal::kShellWindowId_LauncherContainer)->
-      SetLayoutManager(shelf_layout_manager);
-
-  internal::StatusAreaLayoutManager* status_area_layout_manager =
-      new internal::StatusAreaLayoutManager(shelf_layout_manager);
-  GetContainer(aura_shell::internal::kShellWindowId_StatusContainer)->
-      SetLayoutManager(status_area_layout_manager);
+  shelf_layout_controller_.reset(new internal::ShelfLayoutController(
+      launcher_->widget(), status_widget));
+  desktop_layout->set_shelf(shelf_layout_controller_.get());
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraWindows)) {
     EnableWorkspaceManager();
   } else {
     internal::ToplevelLayoutManager* toplevel_layout_manager =
         new internal::ToplevelLayoutManager();
     default_container->SetLayoutManager(toplevel_layout_manager);
-    toplevel_layout_manager->set_shelf(shelf_layout_manager);
+    toplevel_layout_manager->set_shelf(shelf_layout_controller_.get());
   }
 
   // Force a layout.
   desktop_layout->OnWindowResized();
 
   // Initialize ShellAcceleratorFilter
   accelerator_filter_.reset(new internal::ShellAcceleratorFilter);
   AddDesktopEventFilter(accelerator_filter_.get());
 
   // Initialize ShellTooltipManager
@@ skipping 49 matching lines @@
       new internal::WorkspaceController(default_container));
   workspace_controller_->SetLauncherModel(launcher_->model());
   default_container->SetEventFilter(
       new internal::DefaultContainerEventFilter(default_container));
   default_container->SetLayoutManager(
       new internal::DefaultContainerLayoutManager(
           workspace_controller_->workspace_manager()));
 }
 
 }  // namespace aura_shell