Fix accessability for web notification tray.

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"
@@ skipping 691 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 53 matching lines @@
   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 44 matching lines @@
   count_label_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
   count_label_->SetEnabledColor(kMessageCountDimmedColor);
 
   tray_container()->set_size(gfx::Size(kTrayWidth, kTrayHeight));
   tray_container()->AddChildView(count_label_);
 
   UpdateTray();
 }
 
 WebNotificationTray::~WebNotificationTray() {
+  // Release any child views that might have back pointers before ~View().
+  notification_list_.reset();
+  message_center_bubble_.reset();
+  notification_bubble_.reset();
 }
 
 void WebNotificationTray::SetDelegate(Delegate* delegate) {
   DCHECK(!delegate_);
   delegate_ = delegate;
 }
 
 // Add/Update/RemoveNotification are called by the client code, i.e the
 // Delegate implementation or its proxy.
 
@@ skipping 123 matching lines @@
 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 90 matching lines @@
   } else if (bubble == notification_bubble()) {
     HideNotificationBubble();
   }
 }
 
 bool WebNotificationTray::HasNotificationForTest(const std::string& id) const {
   return notification_list_->HasNotification(id);
 }
 
 }  // namespace ash