[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_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"
 #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/toplevel_layout_manager.h"
 #include "ui/aura_shell/toplevel_window_event_filter.h"
 #include "ui/aura_shell/workspace_controller.h"
@@ skipping 151 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();
 
-  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());
 
   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_controller_.get());
+    toplevel_layout_manager->set_shelf(shelf_layout_manager_.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