Add WebNotificationTray

ash/wm/shelf_layout_manager.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/wm/shelf_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "base/auto_reset.h"
 #include "base/i18n/rtl.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/event.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animator.h"
@@ skipping 163 matching lines @@
   LayoutShelf();
 }
 
 bool ShelfLayoutManager::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return false;
 
   alignment_ = alignment;
   if (launcher_)
     launcher_->SetAlignment(alignment);
-  if (Shell::GetInstance()->status_area_widget())
+  StatusAreaWidget* status_area_widget =
+      Shell::GetInstance()->status_area_widget();
+  if (status_area_widget) {
     Shell::GetInstance()->status_area_widget()->SetShelfAlignment(alignment);
-  if (Shell::GetInstance()->system_tray())
-    Shell::GetInstance()->system_tray()->SetShelfAlignment(alignment);
+    if (status_area_widget->system_tray())
+      status_area_widget->system_tray()->SetShelfAlignment(alignment);
+    if (status_area_widget->web_notification_tray())
+      status_area_widget->web_notification_tray()->SetShelfAlignment(alignment);
+  }
   LayoutShelf();
   return true;
 }
 
 gfx::Rect ShelfLayoutManager::GetIdealBounds() {
   // TODO: this is wrong. Figure out what monitor shelf is on and everything
   // should be based on it.
   gfx::Rect bounds(
       gfx::Screen::GetMonitorNearestWindow(status_->GetNativeView()).bounds());
   int width = 0, height = 0;
@@ skipping 273 matching lines @@
        state.visibility_state == AUTO_HIDE) ? 1.0f : 0.0f;
 }
 
 void ShelfLayoutManager::UpdateShelfBackground(
     BackgroundAnimator::ChangeType type) {
   bool launcher_paints = GetLauncherPaintsBackground();
   if (launcher_)
     launcher_->SetPaintsBackground(launcher_paints, type);
   // SystemTray normally draws a background, but we don't want it to draw a
   // background when the launcher does.
-  if (Shell::GetInstance()->system_tray()) {
-    Shell::GetInstance()->system_tray()->SetPaintsBackground(
+  StatusAreaWidget* status_area_widget =
+      Shell::GetInstance()->status_area_widget();
+  if (!status_area_widget)
+    return;
+  if (status_area_widget->system_tray()) {
+    status_area_widget->system_tray()->SetPaintsBackground(
+        !launcher_paints, type);
+  }
+  if (status_area_widget->web_notification_tray()) {
+    status_area_widget->web_notification_tray()->SetPaintsBackground(
         !launcher_paints, type);
   }
 }
 
 bool ShelfLayoutManager::GetLauncherPaintsBackground() const {
   return (!state_.is_screen_locked && window_overlaps_shelf_) ||
       state_.visibility_state == AUTO_HIDE;
 }
 
 void ShelfLayoutManager::UpdateAutoHideStateNow() {
@@ skipping 65 matching lines @@
 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
   if (state.visibility_state == VISIBLE)
     return size;
   if (state.visibility_state == AUTO_HIDE)
     return kAutoHideSize;
   return 0;
 }
 
 }  // namespace internal
 }  // namespace ash