Add WebNotificationTray

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 9d667d8c7598f391f5bb77711b5bc6968a9501a9..175f36b25c81035594107e434fa6d87188dd65b5 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -30,6 +30,7 @@
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/activation_controller.h"
@@ -213,6 +214,12 @@ void CreateSpecialContainers(aura::RootWindow* root_window) {
                   "StatusContainer",
                   lock_screen_related_containers);
 
+  aura::Window* settings_bubble_container = CreateContainer(
+      internal::kShellWindowId_SettingBubbleContainer,
+      "SettingBubbleContainer",
+      lock_screen_related_containers);
+  SetChildWindowVisibilityChangesAnimated(settings_bubble_container);
+
   aura::Window* menu_container = CreateContainer(
       internal::kShellWindowId_MenuContainer,
       "MenuContainer",
@@ -225,12 +232,6 @@ void CreateSpecialContainers(aura::RootWindow* root_window) {
       lock_screen_related_containers);
   SetChildWindowVisibilityChangesAnimated(drag_drop_container);
 
-  aura::Window* settings_bubble_container = CreateContainer(
-      internal::kShellWindowId_SettingBubbleContainer,
-      "SettingBubbleContainer",
-      lock_screen_related_containers);
-  SetChildWindowVisibilityChangesAnimated(settings_bubble_container);
-
   CreateContainer(internal::kShellWindowId_OverlayContainer,
                   "OverlayContainer",
                   lock_screen_related_containers);
@@ -600,6 +601,7 @@ Shell::~Shell() {
 
   // The system tray needs to be reset before all the windows are destroyed.
   system_tray_.reset();
+  web_notification_tray_.reset();
   tray_delegate_.reset();
 
   // Destroy secondary monitor's widgets before all the windows are destroyed.
@@ -760,6 +762,9 @@ void Shell::Init() {
 
   status_area_widget_ = new internal::StatusAreaWidget;
 
+  web_notification_tray_.reset(new WebNotificationTray());
+  status_area_widget_->AddTray(web_notification_tray_.get());
+
   system_tray_.reset(new SystemTray());
   status_area_widget_->AddTray(system_tray_.get());
   system_tray_->Initialize();