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

ui/aura_shell/shell.cc

Index: ui/aura_shell/shell.cc
diff --git a/ui/aura_shell/shell.cc b/ui/aura_shell/shell.cc
index ded7967c1defb0547c5f3c8141d6b4d95f4309f2..9cd0f10c0a556ee598bcc5c2bb3641fa7d0cb33a 100644
--- a/ui/aura_shell/shell.cc
+++ b/ui/aura_shell/shell.cc
@@ -10,6 +10,7 @@
 #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"
@@ -21,7 +22,7 @@
 #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_controller.h"
+#include "ui/aura_shell/shelf_layout_manager.h"
 #include "ui/aura_shell/shell_accelerator_controller.h"
 #include "ui/aura_shell/shell_accelerator_filter.h"
 #include "ui/aura_shell/shell_delegate.h"
@@ -29,6 +30,7 @@
 #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"
@@ -204,9 +206,15 @@ void Shell::Init() {
   if (!status_widget)
     status_widget = internal::CreateStatusArea();
 
-  shelf_layout_controller_.reset(new internal::ShelfLayoutController(
+  shelf_layout_manager_.reset(new internal::ShelfLayoutManager(
       launcher_->widget(), status_widget));
-  desktop_layout->set_shelf(shelf_layout_controller_.get());
+  GetContainer(aura_shell::internal::kShellWindowId_LauncherContainer)->
+      SetLayoutManager(shelf_layout_manager_.get());
+
+  internal::StatusAreaLayoutManager* status_area_layout_manager =
+      new internal::StatusAreaLayoutManager(shelf_layout_manager_.get());
+  GetContainer(aura_shell::internal::kShellWindowId_StatusContainer)->
+      SetLayoutManager(status_area_layout_manager);
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
@@ -217,7 +225,7 @@ void Shell::Init() {
     internal::ToplevelLayoutManager* toplevel_layout_manager =
         new internal::ToplevelLayoutManager();
     default_container->SetLayoutManager(toplevel_layout_manager);
-    toplevel_layout_manager->set_shelf(shelf_layout_controller_.get());
+    toplevel_layout_manager->set_shelf(shelf_layout_manager_.get());
   }
 
   // Force a layout.