ash uber tray: Make it work in ash_shell, and a couple more fixes.

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 392 matching lines @@
 
   CreateSpecialContainers(root_window);
 
   stacking_controller_.reset(new internal::StackingController);
 
   root_window_layout_ = new internal::RootWindowLayoutManager(root_window);
   root_window->SetLayoutManager(root_window_layout_);
 
   if (delegate_.get())
     status_widget_ = delegate_->CreateStatusArea();
-  if (!status_widget_)
-    status_widget_ = internal::CreateStatusArea();
 
   if (command_line->HasSwitch(switches::kAshUberTray)) {
     // TODO(sad): This is rather ugly at the moment. This is because we are
     // supporting both the old and the new status bar at the same time. This
     // will soon get better once the new one is ready and the old one goes out
     // the door.
-    if (delegate_.get())
-      status_widget_ = delegate_->CreateStatusArea();
-    if (!status_widget_)
-      status_widget_ = internal::CreateStatusArea();
-    status_widget_->GetContentsView()->RemoveAllChildViews(false);
     tray_.reset(new SystemTray());
-    status_widget_->GetContentsView()->AddChildView(tray_.get());
+    if (status_widget_) {
+      status_widget_->GetContentsView()->RemoveAllChildViews(false);
+      status_widget_->GetContentsView()->AddChildView(tray_.get());
+    }
 
     if (delegate_.get())
       tray_delegate_.reset(delegate_->CreateSystemTrayDelegate(tray_.get()));
     if (!tray_delegate_.get())
       tray_delegate_.reset(new DummySystemTrayDelegate());
 
     internal::TrayVolume* tray_volume = new internal::TrayVolume();
     internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
     internal::TrayPowerDate* tray_power_date = new internal::TrayPowerDate();
     audio_controller_ = tray_volume;
     brightness_controller_ = tray_brightness;
     power_status_controller_ = tray_power_date;
 
     tray_->AddTrayItem(new internal::TrayUser());
     tray_->AddTrayItem(tray_power_date);
     tray_->AddTrayItem(tray_volume);
     tray_->AddTrayItem(tray_brightness);
     tray_->AddTrayItem(new internal::TraySettings());
   }
+  if (!status_widget_)
+    status_widget_ = internal::CreateStatusArea(tray_.get());
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
   if (window_mode_ == MODE_COMPACT)
     SetupCompactWindowMode();
   else
     SetupNonCompactWindowMode();
 
@@ skipping 217 matching lines @@
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash