Layout panels on top of their launcher icons

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 "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 141 matching lines @@
   SetChildWindowVisibilityChangesAnimated(default_container);
 
   aura::Window* always_on_top_container = CreateContainer(
       internal::kShellWindowId_AlwaysOnTopContainer,
       "AlwaysOnTopContainer",
       non_lock_screen_containers);
   always_on_top_container->SetEventFilter(
       new ToplevelWindowEventFilter(always_on_top_container));
   SetChildWindowVisibilityChangesAnimated(always_on_top_container);
 
-  aura::Window* panel_container = CreateContainer(
-      internal::kShellWindowId_PanelContainer,
-      "PanelContainer",
-      non_lock_screen_containers);
-  if (CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kAuraPanelManager)) {
-    internal::PanelLayoutManager* layout_manager =
-        new internal::PanelLayoutManager(panel_container);
-    panel_container->SetEventFilter(
-        new internal::PanelWindowEventFilter(panel_container, layout_manager));
-    panel_container->SetLayoutManager(layout_manager);
-  }
+  CreateContainer(internal::kShellWindowId_PanelContainer,
+                  "PanelContainer",
+                  non_lock_screen_containers);
 
   CreateContainer(internal::kShellWindowId_AppListContainer,
                   "AppListContainer",
                   non_lock_screen_containers);
 
   CreateContainer(internal::kShellWindowId_LauncherContainer,
                   "LauncherContainer",
                   non_lock_screen_containers);
 
   aura::Window* modal_container = CreateContainer(
@@ skipping 572 matching lines @@
 
   tooltip_controller_.reset(new internal::TooltipController);
   AddRootWindowEventFilter(tooltip_controller_.get());
 
   drag_drop_controller_.reset(new internal::DragDropController);
   power_button_controller_.reset(new PowerButtonController);
   video_detector_.reset(new VideoDetector);
   window_cycle_controller_.reset(new WindowCycleController);
   monitor_controller_.reset(new internal::MonitorController);
 }
 

[sky, 2012/04/03 20:39:37]

Remove this line.

+
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return GetRootWindow()->GetChildById(container_id);
 }
 
 void Shell::AddRootWindowEventFilter(aura::EventFilter* filter) {
@@ skipping 69 matching lines @@
 void Shell::CreateLauncher() {
   if (launcher_.get())
     return;
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
   launcher_->SetFocusCycler(focus_cycler_.get());
   shelf_->SetLauncher(launcher_.get());
+  if (panel_layout_manager_ != NULL)
+    panel_layout_manager_->SetLauncher(launcher_.get());
 
   launcher_->widget()->Show();
 }
 
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 47 matching lines @@
   always_on_top_container->SetLayoutManager(
       new internal::AlwaysOnTopLayoutManager(
           always_on_top_container->GetRootWindow()));
 
   // Create desktop background widget.
   // TODO(bshe): We should be able to use OnDesktopBackgroundChanged function
   // here after issue 117244 got fixed.
   int index = user_wallpaper_delegate_->GetUserWallpaperIndex();
   desktop_background_controller_->SetDesktopBackgroundImageMode(
       GetWallpaper(index), GetWallpaperInfo(index).layout);
+
+  // Create Panel layout manager
+  if (CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kAuraPanelManager)) {
+    aura::Window* panel_container = GetContainer(
+        internal::kShellWindowId_PanelContainer);
+    panel_layout_manager_ =
+        new internal::PanelLayoutManager(panel_container);
+    panel_container->SetEventFilter(
+        new internal::PanelWindowEventFilter(
+            panel_container, panel_layout_manager_));
+    panel_container->SetLayoutManager(panel_layout_manager_);
+  }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash