Fix status area accessability issues.

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/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
@@ skipping 672 matching lines @@
         bubble_view_(NULL),
         bubble_widget_(NULL),
         contents_view_(NULL),
         ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
     views::View* anchor = tray->tray_container();
     TrayBubbleView::InitParams init_params(TrayBubbleView::ANCHOR_TYPE_TRAY,
                                            tray->shelf_alignment());
     init_params.bubble_width = kWebNotificationWidth;
     if (bubble_type == BUBBLE_TYPE_MESAGE_CENTER) {
       init_params.max_height = kWebNotificationBubbleMaxHeight;
+      init_params.can_activate = true;
     } else {
       init_params.arrow_color = kBackgroundColor;
       init_params.close_on_deactivate = false;
     }
     if (tray_->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
       gfx::Point bounds(anchor->width() / 2, 0);
       ConvertPointToWidget(anchor, &bounds);
       init_params.arrow_offset = bounds.x();
     }
     bubble_view_ = TrayBubbleView::Create(anchor, this, init_params);
@@ skipping 25 matching lines @@
     StartAutoCloseTimer();
 
     weak_ptr_factory_.InvalidateWeakPtrs();  // Cancel any pending update.
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&WebNotificationTray::Bubble::UpdateBubbleView,
                    weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(kUpdateDelayMs));
   }
 
+  bool IsVisible() const {
+    return bubble_widget_ && bubble_widget_->IsVisible();
+  }
+
   views::Widget* bubble_widget() const { return bubble_widget_; }
+  TrayBubbleView* bubble_view() const { return bubble_view_; }
 
   // Overridden from TrayBubbleView::Host.
   virtual void BubbleViewDestroyed() OVERRIDE {
     bubble_view_ = NULL;
     contents_view_ = NULL;
   }
 
   virtual void OnMouseEnteredView() OVERRIDE {
     StopAutoCloseTimer();
+    tray_->UpdateShouldShowLauncher();
   }
 
   virtual void OnMouseExitedView() OVERRIDE {
     StartAutoCloseTimer();
+    tray_->UpdateShouldShowLauncher();
   }
 
   virtual void OnClickedOutsideView() OVERRIDE {
     // May delete |this|.
     tray_->HideMessageCenterBubble();
   }
 
+  virtual string16 GetAccessibleName() OVERRIDE {
+    return tray_->GetAccessibleName();
+  }
+
   // Overridden from views::WidgetObserver:
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
     CHECK_EQ(bubble_widget_, widget);
     bubble_widget_ = NULL;
     tray_->HideBubble(this);  // Will destroy |this|.
   }
 
  private:
   void UpdateBubbleView() {
     const WebNotificationList::Notifications& notifications =
@@ skipping 104 matching lines @@
   if (message_center_bubble()) {
     UpdateTray();
     return;
   }
   notification_list_->SetIsVisible(true);  // clears notification count
   UpdateTray();
   HideNotificationBubble();
   message_center_bubble_.reset(
       new Bubble(this, Bubble::BUBBLE_TYPE_MESAGE_CENTER));
   status_area_widget()->SetHideSystemNotifications(true);
+  UpdateShouldShowLauncher();
 }
 
 void WebNotificationTray::HideMessageCenterBubble() {
   if (!message_center_bubble())
     return;
   message_center_bubble_.reset();
   show_message_center_on_unlock_ = false;
   notification_list_->SetIsVisible(false);
   status_area_widget()->SetHideSystemNotifications(false);
+  UpdateShouldShowLauncher();
 }
 
 void WebNotificationTray::ShowNotificationBubble() {
   if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED)
     return;
   if (message_center_bubble())
     return;
   if (!status_area_widget()->ShouldShowNonSystemNotifications())
     return;
   UpdateTray();
@@ skipping 18 matching lines @@
     }
     HideNotificationBubble();
   } else {
     if (show_message_center_on_unlock_)
       ShowMessageCenterBubble();
     show_message_center_on_unlock_ = false;
   }
   UpdateTray();
 }
 
+bool WebNotificationTray::IsMessageCenterBubbleVisible() const {
+  return (message_center_bubble() && message_center_bubble_->IsVisible());
+}
+
+bool WebNotificationTray::IsMouseInNotificationBubble() const {
+  if (!notification_bubble())
+    return false;
+  return notification_bubble_->bubble_view()->GetBoundsInScreen().Contains(
+      gfx::Screen::GetCursorScreenPoint());
+}
+
 void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   if (alignment == SHELF_ALIGNMENT_BOTTOM)
     tray_container()->set_size(gfx::Size(kTrayWidth, kTrayHeight));
   else
     tray_container()->set_size(gfx::Size(kTraySideWidth, kTraySideHeight));
   // Destroy any existing bubble so that it will be rebuilt correctly.
   HideMessageCenterBubble();
   HideNotificationBubble();
 }
 
+void WebNotificationTray::AnchorUpdated() {
+  if (notification_bubble_.get()) {
+    notification_bubble_->bubble_view()->UpdateBubble();
+    // Ensure that the notification buble is above the launcher/status area.
+    notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
+  }
+  if (message_center_bubble_.get())
+    message_center_bubble_->bubble_view()->UpdateBubble();
+}
+
+string16 WebNotificationTray::GetAccessibleName() {
+  return l10n_util::GetStringUTF16(
+      IDS_ASH_WEB_NOTIFICATION_TRAY_ACCESSIBLE_NAME);
+}
+
 // Protected methods (invoked only from Bubble and its child classes)
 
 void WebNotificationTray::SendRemoveNotification(const std::string& id) {
   // If this is the only notification in the list, close the bubble.
   if (notification_list_->notifications().size() == 1 &&
       id == notification_list_->GetFirstId()) {
     HideMessageCenterBubble();
   }
   if (delegate_)
     delegate_->NotificationRemoved(id);
@@ skipping 55 matching lines @@
 
 // Private methods
 
 void WebNotificationTray::UpdateTray() {
   count_label_->SetText(UTF8ToUTF16(
       GetNotificationText(notification_list()->unread_count())));
   // Dim the message count text only if the message center is empty.
   count_label_->SetEnabledColor(
       (notification_list()->notifications().size() == 0) ?
       kMessageCountDimmedColor : kMessageCountColor);
-  SetVisible((status_area_widget()->login_status() != user::LOGGED_IN_NONE));
+  bool is_visible =
+      (status_area_widget()->login_status() != user::LOGGED_IN_NONE) &&
+      (status_area_widget()->login_status() != user::LOGGED_IN_LOCKED);
+  SetVisible(is_visible);
   Layout();
   SchedulePaint();
 }
 
 void WebNotificationTray::UpdateTrayAndBubble() {
   UpdateTray();
 
   if (message_center_bubble())
     message_center_bubble()->ScheduleUpdate();
 
@@ skipping 11 matching lines @@
   } else if (bubble == notification_bubble()) {
     HideNotificationBubble();
   }
 }
 
 bool WebNotificationTray::HasNotificationForTest(const std::string& id) const {
   return notification_list_->HasNotification(id);
 }
 
 }  // namespace ash