Revert 152135 - Fix accessability for web notification tray.

ash/system/tray/tray_background_view.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/tray_background_view.h"
 
 #include "ash/launcher/background_animator.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ui/aura/window.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 
 const SkColor kTrayBackgroundAlpha = 100;
 const SkColor kTrayBackgroundHoverAlpha = 150;
@@ skipping 175 matching lines @@
 }
 
 void TrayBackgroundView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 void TrayBackgroundView::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 (HasFocus() && (focusable() || IsAccessibilityFocusable()))
+  if (GetWidget() && GetWidget()->IsActive())
     DrawBorder(canvas, GetContentsBounds());
 }
 
-void TrayBackgroundView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
-  state->name = GetAccessibleName();
-}
-
 void TrayBackgroundView::AboutToRequestFocusFromTabTraversal(bool reverse) {
   // Return focus to the login view. See crbug.com/120500.
   views::View* v = GetNextFocusableView();
   if (v)
     v->AboutToRequestFocusFromTabTraversal(reverse);
 }
 
 bool TrayBackgroundView::PerformAction(const ui::Event& event) {
   return false;
 }
@@ skipping 21 matching lines @@
 }
 
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
   SetBorder();
   tray_container_->SetAlignment(alignment);
 }
 
 void TrayBackgroundView::SetBorder() {
   views::View* parent = status_area_widget_->status_area_widget_delegate();
-  // Tray views are laid out right-to-left or bottom-to-top
-  int on_edge = (this == parent->child_at(0));
+  int child_count = parent->child_count();
+  DCHECK(child_count > 0);
+  int on_edge = (this == parent->child_at(child_count-1));
   // Change the border padding for different shelf alignment.
   if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
     set_border(views::Border::CreateEmptyBorder(
         0, 0, kPaddingFromBottomOfScreenBottomAlignment,
         on_edge ? kPaddingFromRightEdgeOfScreenBottomAlignment : 0));
   } else if (shelf_alignment() == SHELF_ALIGNMENT_LEFT) {
     set_border(views::Border::CreateEmptyBorder(
         0, kPaddingFromOuterEdgeOfLauncherVerticalAlignment,
         on_edge ? kPaddingFromBottomOfScreenVerticalAlignment : 0,
         kPaddingFromInnerEdgeOfLauncherVerticalAlignment));
   } else {
     set_border(views::Border::CreateEmptyBorder(
         0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment,
         on_edge ? kPaddingFromBottomOfScreenVerticalAlignment : 0,
         kPaddingFromOuterEdgeOfLauncherVerticalAlignment));
   }
 }
 
 void TrayBackgroundView::UpdateShouldShowLauncher() {
   status_area_widget()->UpdateShouldShowLauncher();
 }
 
 }  // namespace internal
 }  // namespace ash