Do not hide the web notification popups by the system tray, rather let them avoid (2nd)

ash/system/web_notification/web_notification_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/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/auto_reset.h"
 #include "base/i18n/number_formatting.h"
+#include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_strings.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/screen.h"
+#include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/message_center/views/message_center_bubble.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ skipping 28 matching lines @@
 
 // Observes the change of work area (including temporary change by auto-hide)
 // and notifies MessagePopupCollection.
 class WorkAreaObserver : public ShelfLayoutManagerObserver,
                          public ShellObserver {
  public:
   WorkAreaObserver(message_center::MessagePopupCollection* collection,
                    ShelfLayoutManager* shelf);
   virtual ~WorkAreaObserver();
 
+  void SetSystemTrayHeight(int height);
+
   // Overridden from ShellObserver:
   virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE;
 
   // Overridden from ShelfLayoutManagerObserver:
   virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE;
 
  private:
   message_center::MessagePopupCollection* collection_;
   ShelfLayoutManager* shelf_;
+  int system_tray_height_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkAreaObserver);
 };
 
 WorkAreaObserver::WorkAreaObserver(
     message_center::MessagePopupCollection* collection,
     ShelfLayoutManager* shelf)
     : collection_(collection),
-      shelf_(shelf) {
+      shelf_(shelf),
+      system_tray_height_(0) {
   DCHECK(collection_);
   shelf_->AddObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 WorkAreaObserver::~WorkAreaObserver() {
   Shell::GetInstance()->RemoveShellObserver(this);
   shelf_->RemoveObserver(this);
 }
 
+void WorkAreaObserver::SetSystemTrayHeight(int height) {
+  system_tray_height_ = height;
+  if (system_tray_height_ > 0 && ash::switches::UseAlternateShelfLayout())
+    system_tray_height_ += message_center::kMarginBetweenItems;
+
+  OnAutoHideStateChanged(shelf_->auto_hide_state());
+}
+
 void WorkAreaObserver::OnDisplayWorkAreaInsetsChanged() {
   collection_->OnDisplayBoundsChanged(
       Shell::GetScreen()->GetDisplayNearestWindow(
           shelf_->shelf_widget()->GetNativeView()));
 }
 
 void WorkAreaObserver::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   gfx::Display display = Shell::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
   gfx::Rect work_area = display.work_area();
-  int width = (new_state == SHELF_AUTO_HIDE_HIDDEN) ?
-      ShelfLayoutManager::kAutoHideSize :
-      ShelfLayoutManager::GetPreferredShelfSize();
+  int width = 0;
+  if (shelf_->auto_hide_behavior() != SHELF_AUTO_HIDE_BEHAVIOR_NEVER) {
+    width = (new_state == SHELF_AUTO_HIDE_HIDDEN) ?
+        ShelfLayoutManager::kAutoHideSize :
+        ShelfLayoutManager::GetPreferredShelfSize();
+  }
   switch (shelf_->GetAlignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
       work_area.Inset(0, 0, 0, width);
+      if (system_tray_height_ > 0) {
+        work_area.set_height(
+            std::max(0, work_area.height() - system_tray_height_));
+      }
       break;
     case SHELF_ALIGNMENT_LEFT:
       work_area.Inset(width, 0, 0, 0);
+      // Popups appear on the left bottom only when UI is RTL.
+      if (base::i18n::IsRTL() && system_tray_height_ > 0) {
+        work_area.set_height(
+            std::max(0, work_area.height() - system_tray_height_));
+      }
       break;
     case SHELF_ALIGNMENT_RIGHT:
       work_area.Inset(0, 0, width, 0);
+      // Popups appear on the right bottom only when UI isn't RTL.
+      if (!base::i18n::IsRTL() && system_tray_height_ > 0) {
+        work_area.set_height(
+            std::max(0, work_area.height() - system_tray_height_));
+      }
       break;
     case SHELF_ALIGNMENT_TOP:
       work_area.Inset(0, width, 0, 0);
+      if (system_tray_height_ > 0) {
+        work_area.set_y(work_area.y() + system_tray_height_);
+        work_area.set_height(
+            std::max(0, work_area.height() - system_tray_height_));
+      }
       break;
   }
   collection_->SetDisplayInfo(work_area, display.bounds());
 }
 
 // Class to initialize and manage the WebNotificationBubble and
 // TrayBubbleWrapper instances for a bubble.
 class WebNotificationBubbleWrapper {
  public:
   // Takes ownership of |bubble| and creates |bubble_wrapper_|.
@@ skipping 174 matching lines @@
   if (!message_center_bubble())
     return;
   message_center_bubble_.reset();
   should_block_shelf_auto_hide_ = false;
   show_message_center_on_unlock_ = false;
   status_area_widget()->SetHideSystemNotifications(false);
   GetShelfLayoutManager()->UpdateAutoHideState();
   button_->SetBubbleVisible(false);
 }
 
-void WebNotificationTray::SetHidePopupBubble(bool hide) {
-  if (hide)
-    message_center_tray_->HidePopupBubble();
-  else
-    message_center_tray_->ShowPopupBubble();
+void WebNotificationTray::SetSystemTrayHeight(int height) {
+  if (!work_area_observer_)
+    return;
+  work_area_observer_->SetSystemTrayHeight(height);
 }
 
 bool WebNotificationTray::ShowPopups() {
   if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED ||
       message_center_bubble() ||
       !status_area_widget()->ShouldShowWebNotifications()) {
     return false;
   }
 
   popup_collection_.reset(new message_center::MessagePopupCollection(
@@ skipping 224 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash