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

ash/status_area/status_area_view.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/status_area/status_area_view.h"
 
 #include "ash/ash_export.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/utf_string_conversions.h"
@@ skipping 23 matching lines @@
 }
 
 const views::Widget* StatusAreaView::GetWidget() const {
   return View::GetWidget();
 }
 
 void StatusAreaView::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(status_mock_, 0, 0);
 }
 
-ASH_EXPORT views::Widget* CreateStatusArea() {
+ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents) {
   StatusAreaView* status_area_view = new StatusAreaView;
+  if (!contents)
+    contents = status_area_view;
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  gfx::Size ps = status_area_view->GetPreferredSize();
+  gfx::Size ps = contents->GetPreferredSize();
   params.bounds = gfx::Rect(0, 0, ps.width(), ps.height());
   params.delegate = status_area_view;
   params.parent = Shell::GetInstance()->GetContainer(
       ash::internal::kShellWindowId_StatusContainer);
   params.transparent = true;
   widget->Init(params);
   widget->set_focus_on_creation(false);
-  widget->SetContentsView(status_area_view);
+  widget->SetContentsView(contents);
   widget->Show();
   widget->GetNativeView()->SetName("StatusAreaView");
   return widget;
 }
 
 }  // namespace internal
 }  // namespace ash