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

ash/system/tray/system_tray.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/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
+#include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/shadow_types.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace {
 
 const int kTrayIconHeight = 50;
 const int kPadding = 5;
 
 class SystemTrayBubble : public views::BubbleDelegateView {
  public:
   SystemTrayBubble(ash::SystemTray* tray,
                    std::vector<ash::SystemTrayItem*>& items,
                    bool detailed)
       : views::BubbleDelegateView(tray, views::BubbleBorder::BOTTOM_RIGHT),
         tray_(tray),
         items_(items),
         detailed_(detailed) {
     set_margin(0);
+    set_parent_window(ash::Shell::GetInstance()->GetContainer(
+        ash::internal::kShellWindowId_SettingBubbleContainer));
   }
 
   virtual ~SystemTrayBubble() {
     for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
         it != items_.end();
         ++it) {
       if (detailed_)
         (*it)->DestroyDetailedView();
       else
         (*it)->DestroyDefaultView();
@@ skipping 96 matching lines @@
     if (view)
       AddChildViewAt(view, 0);
   }
   PreferredSizeChanged();
 }
 
 void SystemTray::ShowItems(std::vector<SystemTrayItem*>& items, bool detailed) {
   CHECK(!popup_);
   SystemTrayBubble* bubble = new SystemTrayBubble(this, items, detailed);
   popup_ = views::BubbleDelegateView::CreateBubble(bubble);
+  bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   popup_->AddObserver(this);
   bubble->Show();
 }
 
 bool SystemTray::OnMousePressed(const views::MouseEvent& event) {
   if (popup_)
     popup_->Show();
   else
     ShowItems(items_, false);
   return true;
 }
 
 void SystemTray::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(popup_, widget);
   popup_ = NULL;
 }
 
 }  // namespace ash