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

ash/system/tray/system_tray.cc

Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 763efc02b5418c12a8a64fec30cd184efd8b9b23..1d4d7424de4f9c1883a73534e395fca6ffdaab0e 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -34,6 +35,8 @@ class SystemTrayBubble : public views::BubbleDelegateView {
         items_(items),
         detailed_(detailed) {
     set_margin(0);
+    set_parent_window(ash::Shell::GetInstance()->GetContainer(
+        ash::internal::kShellWindowId_SettingBubbleContainer));
   }
 
   virtual ~SystemTrayBubble() {
@@ -150,6 +153,7 @@ 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();
 }