[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 32c84bd0dc8d117fc3028e118f7b412459a37e0f..289a38cb0ea077da59beb038082d905a85f5fd51 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"
@@ -193,9 +194,12 @@ 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)->

[sky, 2011/12/02 19:25:53]

This won't work. Window owns the LayoutManager, meaning this code will give us a
double delete. I say rename StatusContainer to ShelfContainer and remove
LauncherContainer.

[Nikita (slow), 2011/12/02 21:34:27]

They have to stay in a separate containers as launcher has to stay below the
lock / login screen and status area above them.

Is there any other approach than placing launcher in status area container and
hiding it when any window is added to the lock container. That's not a flexible
approach.

[Nikita (slow), 2011/12/05 14:41:46]

Done.

+      SetLayoutManager(shelf_layout_manager_.get());
+  GetContainer(aura_shell::internal::kShellWindowId_StatusContainer)->
+      SetLayoutManager(shelf_layout_manager_.get());
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
@@ -206,7 +210,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.