Fix status area accessability issues.

ash/system/tray/system_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/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 12 matching lines @@
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_bubble.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/tray_update.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/tray_user.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "base/logging.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
-namespace internal {
-
-// Observe the tray layer animation and update the anchor when it changes.
-// TODO(stevenjb): Observe or mirror the actual animation, not just the start
-// and end points.
-class SystemTrayLayerAnimationObserver : public ui::LayerAnimationObserver {
- public:
-  explicit SystemTrayLayerAnimationObserver(SystemTray* host) : host_(host) {}
-
-  virtual void OnLayerAnimationEnded(ui::LayerAnimationSequence* sequence) {
-    host_->UpdateNotificationAnchor();
-  }
-
-  virtual void OnLayerAnimationAborted(ui::LayerAnimationSequence* sequence) {
-    host_->UpdateNotificationAnchor();
-  }
-
-  virtual void OnLayerAnimationScheduled(ui::LayerAnimationSequence* sequence) {
-    host_->UpdateNotificationAnchor();
-  }
-
- private:
-  SystemTray* host_;
-
-  DISALLOW_COPY_AND_ASSIGN(SystemTrayLayerAnimationObserver);
-};
-
-}  // namespace internal
-
 // SystemTray
 
 using internal::SystemTrayBubble;
-using internal::SystemTrayLayerAnimationObserver;
 using internal::TrayBubbleView;
 
 SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget)
     : internal::TrayBackgroundView(status_area_widget),
       items_(),
       accessibility_observer_(NULL),
       audio_observer_(NULL),
       bluetooth_observer_(NULL),
       brightness_observer_(NULL),
       caps_lock_observer_(NULL),
       clock_observer_(NULL),
       drive_observer_(NULL),
       ime_observer_(NULL),
       locale_observer_(NULL),
       network_observer_(NULL),
       update_observer_(NULL),
       user_observer_(NULL),
-      should_show_launcher_(false),
       default_bubble_height_(0),
       hide_notifications_(false) {
 }
 
 SystemTray::~SystemTray() {
   bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end();
        ++it) {
     (*it)->DestroyTrayView();
   }
 }
 
-void SystemTray::Initialize() {
-  layer_animation_observer_.reset(new SystemTrayLayerAnimationObserver(this));
-  GetWidget()->GetNativeView()->layer()->GetAnimator()->AddObserver(
-      layer_animation_observer_.get());
-}
-
 void SystemTray::CreateItems() {
   internal::TrayVolume* tray_volume = new internal::TrayVolume();
   internal::TrayBluetooth* tray_bluetooth = new internal::TrayBluetooth();
   internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
   internal::TrayDate* tray_date = new internal::TrayDate();
   internal::TrayPower* tray_power = new internal::TrayPower();
   internal::TrayNetwork* tray_network = new internal::TrayNetwork;
   internal::TraySms* tray_sms = new internal::TraySms();
   internal::TrayUser* tray_user = new internal::TrayUser;
   internal::TrayAccessibility* tray_accessibility =
@@ skipping 38 matching lines @@
   AddTrayItem(tray_date);
   SetVisible(ash::Shell::GetInstance()->tray_delegate()->
       GetTrayVisibilityOnStartup());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
   SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
-  item->UpdateAfterShelfAlignmentChange(
-      ash::Shell::GetInstance()->system_tray()->shelf_alignment());
+  item->UpdateAfterShelfAlignmentChange(shelf_alignment());
 
   if (tray_item) {
     tray_container()->AddChildViewAt(tray_item, 0);
     PreferredSizeChanged();
     tray_item_map_[item] = tray_item;
   }
 }
 
 void SystemTray::RemoveTrayItem(SystemTrayItem* item) {
   NOTIMPLEMENTED();
@@ skipping 66 matching lines @@
     (*it)->UpdateAfterShelfAlignmentChange(alignment);
   }
 }
 
 void SystemTray::SetHideNotifications(bool hide_notifications) {
   if (notification_bubble_.get())
     notification_bubble_->SetVisible(!hide_notifications);
   hide_notifications_ = hide_notifications;
 }
 
+bool SystemTray::IsSystemBubbleVisible() const {
+  return (bubble_.get() && bubble_->IsVisible());
+}
+
 bool SystemTray::IsAnyBubbleVisible() const {
   if (bubble_.get() && bubble_->IsVisible())
     return true;
   if (notification_bubble_.get() && notification_bubble_->IsVisible())
     return true;
   return false;
 }
 
+bool SystemTray::IsMouseInNotificationBubble() const {
+  if (!notification_bubble_.get())
+    return false;
+  return notification_bubble_->bubble_view()->GetBoundsInScreen().Contains(
+      gfx::Screen::GetCursorScreenPoint());
+}
+
 bool SystemTray::CloseBubbleForTest() const {
   if (!bubble_.get())
     return false;
   bubble_->Close();
   return true;
 }
 
 // Private methods.
 
 void SystemTray::DestroyBubble() {
   bubble_.reset();
   detailed_item_ = NULL;
 }
 
 void SystemTray::RemoveBubble(SystemTrayBubble* bubble) {
   if (bubble == bubble_.get()) {
     DestroyBubble();
     UpdateNotificationBubble();  // State changed, re-create notifications.
-    if (should_show_launcher_) {
-      // No need to show the launcher if the mouse isn't over the status area
-      // anymore.
-      should_show_launcher_ = GetWidget()->GetWindowBoundsInScreen().Contains(
-          gfx::Screen::GetCursorScreenPoint());
-      if (!should_show_launcher_)
-        Shell::GetInstance()->shelf()->UpdateAutoHideState();
-    }
+    UpdateShouldShowLauncher();
   } else if (bubble == notification_bubble_) {
     notification_bubble_.reset();
   } else {
     NOTREACHED();
   }
 }
 
 int SystemTray::GetTrayXOffset(SystemTrayItem* item) const {
   // Don't attempt to align the arrow if the shelf is on the left or right.
   if (shelf_alignment() != SHELF_ALIGNMENT_BOTTOM)
@@ skipping 56 matching lines @@
   }
   // Save height of default view for creating detailed views directly.
   if (!detailed)
     default_bubble_height_ = bubble_->bubble_view()->height();
 
   if (detailed && items.size() > 0)
     detailed_item_ = items[0];
   else
     detailed_item_ = NULL;
 
-  // If we have focus the shelf should be visible and we need to continue
-  // showing the shelf when the popup is shown.
-  if (GetWidget()->IsActive())
-    should_show_launcher_ = true;
-
   UpdateNotificationBubble();  // State changed, re-create notifications.
   status_area_widget()->HideNonSystemNotifications();
+  UpdateShouldShowLauncher();
 }
 
 void SystemTray::UpdateNotificationBubble() {
   // Only show the notification buble if we have notifications and we are not
   // showing the default bubble.
   if (notification_items_.empty() ||
       (bubble_.get() &&
        bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
     notification_bubble_.reset();
     return;
@@ skipping 29 matching lines @@
   init_params.arrow_color = kBackgroundColor;
   user::LoginStatus login_status =
       Shell::GetInstance()->tray_delegate()->GetUserLoginStatus();
   notification_bubble_->InitView(anchor, init_params, login_status);
   if (hide_notifications_)
     notification_bubble_->SetVisible(false);
   else
     status_area_widget()->HideNonSystemNotifications();
 }
 
-void SystemTray::UpdateNotificationAnchor() {
-  if (!notification_bubble_.get())
-    return;
-  notification_bubble_->bubble_view()->UpdateBubble();
-  // Ensure that the notification buble is above the launcher/status area.
-  notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
-}
-
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   UpdateAfterShelfAlignmentChange(alignment);
   // Destroy any existing bubble so that it is rebuilt correctly.
   bubble_.reset();
   // Rebuild any notification bubble.
   if (notification_bubble_.get()) {
     notification_bubble_.reset();
     UpdateNotificationBubble();
   }
 }
 
+void SystemTray::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 (bubble_.get())
+    bubble_->bubble_view()->UpdateBubble();
+}
+
+string16 SystemTray::GetAccessibleName() {
+  return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
+}
+
 bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT) {
     bubble_->Close();
   } else {
     int arrow_offset = TrayBubbleView::InitParams::kArrowDefaultOffset;
     if (event.IsMouseEvent() || event.type() == ui::ET_GESTURE_TAP) {
       const views::LocatedEvent& located_event =
           static_cast<const views::LocatedEvent&>(event);
       if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
         gfx::Point point(located_event.x(), 0);
         ConvertPointToWidget(this, &point);
         arrow_offset = point.x();
       }
     }
     ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
   }
   return true;
 }
 
-void SystemTray::OnMouseEntered(const views::MouseEvent& event) {
-  TrayBackgroundView::OnMouseEntered(event);
-  should_show_launcher_ = true;
-}
-
-void SystemTray::OnMouseExited(const views::MouseEvent& event) {
-  TrayBackgroundView::OnMouseExited(event);
-  // When the popup closes we'll update |should_show_launcher_|.
-  if (!bubble_.get())
-    should_show_launcher_ = false;
-}
-
-void SystemTray::AboutToRequestFocusFromTabTraversal(bool reverse) {
-  views::View* v = GetNextFocusableView();
-  if (v)
-    v->AboutToRequestFocusFromTabTraversal(reverse);
-}
-
-void SystemTray::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
-  state->name = l10n_util::GetStringUTF16(
-      IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
-}
-
-void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  // The tray itself expands to the right and bottom edge of the screen to make
-  // sure clicking on the edges brings up the popup. However, the focus border
-  // should be only around the container.
-  if (GetWidget() && GetWidget()->IsActive())
-    DrawBorder(canvas, GetContentsBounds());
-}
-
 }  // namespace ash