Observes work area change and auto-hide for notifications.

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"
@@ skipping 36 matching lines @@
 
 const int kWebNotificationIconSize = 31;
 // Height of the art assets used in alternate shelf layout,
 // see ash/ash_switches.h:UseAlternateShelfLayout.
 const int kWebNotificationAlternateSize = 38;
 const SkColor kWebNotificationColorNoUnread = SkColorSetA(SK_ColorWHITE, 128);
 const SkColor kWebNotificationColorWithUnread = SK_ColorWHITE;
 
 }
 
+// Observes the change of work area (including temporary change by auto-hide)
+// and notifies to MessagePopupCollection.
+class WorkAreaObserver : public ShelfLayoutManagerObserver,
+                         public ShellObserver {
+ public:
+  WorkAreaObserver(message_center::MessagePopupCollection* collection,
+                   ShelfLayoutManager* shelf);
+  virtual ~WorkAreaObserver();
+
+  // Overridden from ShellObserver:
+  virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE;
+
+  // Overridden from ShelfLayoutManagerObserver:
+  virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE;
+
+ private:
+  message_center::MessagePopupCollection* collection_;
+  ShelfLayoutManager* shelf_;
+
+  DISALLOW_COPY_AND_ASSIGN(WorkAreaObserver);
+};
+
+WorkAreaObserver::WorkAreaObserver(
+    message_center::MessagePopupCollection* collection,
+    ShelfLayoutManager* shelf)
+    : collection_(collection),
+      shelf_(shelf) {
+  DCHECK(collection_);
+  shelf_->AddObserver(this);
+  Shell::GetInstance()->AddShellObserver(this);
+}
+
+WorkAreaObserver::~WorkAreaObserver() {
+  Shell::GetInstance()->RemoveShellObserver(this);
+  shelf_->RemoveObserver(this);
+}
+
+void WorkAreaObserver::OnDisplayWorkAreaInsetsChanged() {
+  collection_->OnDisplayBoundsChanged(
+      Shell::GetScreen()->GetDisplayNearestWindow(
+          shelf_->shelf_widget()->GetNativeView()));
+}
+
+void WorkAreaObserver::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
+  gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(
+      shelf_->shelf_widget()->GetNativeView()).work_area();
+  int 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);
+      break;
+    case SHELF_ALIGNMENT_LEFT:
+      work_area.Inset(width, 0, 0, 0);
+      break;
+    case SHELF_ALIGNMENT_RIGHT:
+      work_area.Inset(0, 0, width, 0);
+      break;
+    case SHELF_ALIGNMENT_TOP:
+      work_area.Inset(0, width, 0, 0);
+      break;
+  }
+  collection_->SetWorkArea(work_area);
+}
+
 // Class to initialize and manage the WebNotificationBubble and
 // TrayBubbleWrapper instances for a bubble.
-
 class WebNotificationBubbleWrapper {
  public:
   // Takes ownership of |bubble| and creates |bubble_wrapper_|.
   WebNotificationBubbleWrapper(WebNotificationTray* tray,
                                message_center::MessageBubbleBase* bubble) {
     bubble_.reset(bubble);
     views::TrayBubbleView::AnchorAlignment anchor_alignment =
         tray->GetAnchorAlignment();
     views::TrayBubbleView::InitParams init_params =
         bubble->GetInitParams(anchor_alignment);
@@ skipping 96 matching lines @@
   SetVisible(false);
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this,
       message_center::MessageCenter::Get()));
   OnMessageCenterTrayChanged();
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Release any child views that might have back pointers before ~View().
   message_center_bubble_.reset();
   popup_collection_.reset();

[dewittj, 2013/07/16 21:31:33]

work_area_observer_.reset() here?

[Jun Mukai, 2013/07/16 22:49:42]

Done.

 }
 
 // Public methods.
 
 bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
   if (!ShouldShowMessageCenter())
     return false;
 
   should_block_shelf_auto_hide_ = true;
   message_center::MessageCenterBubble* message_center_bubble =
@@ skipping 65 matching lines @@
       !status_area_widget()->ShouldShowWebNotifications()) {
     return false;
   }
 
   popup_collection_.reset(new message_center::MessagePopupCollection(
       ash::Shell::GetContainer(
           GetWidget()->GetNativeView()->GetRootWindow(),
           internal::kShellWindowId_StatusContainer),
       message_center(),
       message_center_tray_.get()));
-
+  work_area_observer_.reset(new internal::WorkAreaObserver(
+      popup_collection_.get(), GetShelfLayoutManager()));
   return true;
 }
 
 void WebNotificationTray::HidePopups() {
   popup_collection_.reset();
+  work_area_observer_.reset();

[dewittj, 2013/07/16 21:31:33]

I don't love how the work_area_observer_ needs to be manually managed at the
same time as popup_collection_ but it seems correct at this time.

[Jun Mukai, 2013/07/16 22:49:42]

we can disable work_area_observer_ or something, but just removing observer
itself would be good, since this doesn't do anything if there is not
popup_collection_.

 }
 
 // Private methods.
 
 bool WebNotificationTray::ShouldShowMessageCenter() {
   return status_area_widget()->login_status() != user::LOGGED_IN_LOCKED &&
       !(status_area_widget()->system_tray() &&
         status_area_widget()->system_tray()->HasNotificationBubble());
 }
 
@@ skipping 200 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