Add WebNotificationTray

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 <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 12 matching lines @@
 #include "ash/screen_ash.h"
 #include "ash/shell_context_menu.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/network/network_observer.h"
 #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"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/key_rewriter_event_filter.h"
 #include "ash/wm/panel_layout_manager.h"
@@ skipping 163 matching lines @@
   lock_modal_container->SetEventFilter(
       new ToplevelWindowEventFilter(lock_modal_container));
   lock_modal_container->SetLayoutManager(
       new internal::SystemModalContainerLayoutManager(lock_modal_container));
   SetChildWindowVisibilityChangesAnimated(lock_modal_container);
 
   CreateContainer(internal::kShellWindowId_StatusContainer,
                   "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",
       lock_screen_related_containers);
   SetChildWindowVisibilityChangesAnimated(menu_container);
 
   aura::Window* drag_drop_container = CreateContainer(
       internal::kShellWindowId_DragImageAndTooltipContainer,
       "DragImageAndTooltipContainer",
       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);
 }
 
 // This dummy class is used for shell unit tests. We dont have chrome delegate
 // in these tests.
 class DummyUserWallpaperDelegate : public UserWallpaperDelegate {
  public:
   DummyUserWallpaperDelegate() {}
@@ skipping 349 matching lines @@
   // TooltipController is deleted with the Shell so removing its references.
   RemoveRootWindowEventFilter(tooltip_controller_.get());
   aura::client::SetTooltipClient(GetPrimaryRootWindow(), NULL);
 
   // Make sure we delete WorkspaceController before launcher is
   // deleted as it has a reference to launcher model.
   workspace_controller_.reset();
 
   // 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.
   monitor_controller_.reset();
 
   // Delete containers now so that child windows does not access
   // observers when they are destructed.
   aura::RootWindow* root_window = GetPrimaryRootWindow();
   while (!root_window->children().empty()) {
     aura::Window* child = root_window->children()[0];
@@ skipping 140 matching lines @@
 
   stacking_controller_.reset(new internal::StackingController);
 
   root_window_layout_ = new internal::RootWindowLayoutManager(root_window);
   root_window->SetLayoutManager(root_window_layout_);
 
   event_client_.reset(new internal::EventClientImpl(root_window));
 
   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();
 
   if (delegate_.get()) {
     tray_delegate_.reset(delegate_->CreateSystemTrayDelegate(
         system_tray_.get()));
   }
   if (!tray_delegate_.get())
     tray_delegate_.reset(new DummySystemTrayDelegate());
@@ skipping 272 matching lines @@
     panel_container->SetLayoutManager(panel_layout_manager_);
   }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash