Commit 1be7baa3 authored by Manu Cornet's avatar Manu Cornet Committed by Commit Bot

CrOS Shelf: Simplify a11y inheritance for |ShelfView|

Bug: 973482, 973446
Change-Id: I20d801d414f24f6bba4e155a7d6f1c7020a07eb7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1743186Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685271}
parent 707f495a
...@@ -707,14 +707,6 @@ views::FocusSearch* ShelfView::GetFocusSearch() { ...@@ -707,14 +707,6 @@ views::FocusSearch* ShelfView::GetFocusSearch() {
return focus_search_.get(); return focus_search_.get();
} }
views::FocusTraversable* ShelfView::GetFocusTraversableParent() {
return parent()->GetFocusTraversable();
}
View* ShelfView::GetFocusTraversableParentView() {
return this;
}
void ShelfView::CreateDragIconProxy( void ShelfView::CreateDragIconProxy(
const gfx::Point& location_in_screen_coordinates, const gfx::Point& location_in_screen_coordinates,
const gfx::ImageSkia& icon, const gfx::ImageSkia& icon,
......
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "ui/views/accessibility/view_accessibility.h" #include "ui/views/accessibility/view_accessibility.h"
#include "ui/views/accessible_pane_view.h"
#include "ui/views/animation/bounds_animator_observer.h" #include "ui/views/animation/bounds_animator_observer.h"
#include "ui/views/animation/ink_drop_state.h" #include "ui/views/animation/ink_drop_state.h"
#include "ui/views/context_menu_controller.h" #include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/button.h" #include "ui/views/controls/button/button.h"
#include "ui/views/controls/menu/menu_types.h" #include "ui/views/controls/menu/menu_types.h"
#include "ui/views/focus/focus_manager.h" #include "ui/views/focus/focus_manager.h"
#include "ui/views/view.h"
#include "ui/views/view_model.h" #include "ui/views/view_model.h"
namespace ui { namespace ui {
...@@ -105,12 +105,11 @@ enum ShelfAlignmentUmaEnumValue { ...@@ -105,12 +105,11 @@ enum ShelfAlignmentUmaEnumValue {
// (for the main shelf) last_visible_index = 7 // (for the main shelf) last_visible_index = 7
// //
class ASH_EXPORT ShelfView : public views::View, class ASH_EXPORT ShelfView : public views::AccessiblePaneView,
public ShelfButtonDelegate, public ShelfButtonDelegate,
public ShelfModelObserver, public ShelfModelObserver,
public ShellObserver, public ShellObserver,
public views::ContextMenuController, public views::ContextMenuController,
public views::FocusTraversable,
public views::BoundsAnimatorObserver, public views::BoundsAnimatorObserver,
public app_list::ApplicationDragAndDropHost, public app_list::ApplicationDragAndDropHost,
public ash::TabletModeObserver, public ash::TabletModeObserver,
...@@ -197,8 +196,6 @@ class ASH_EXPORT ShelfView : public views::View, ...@@ -197,8 +196,6 @@ class ASH_EXPORT ShelfView : public views::View,
// Overridden from FocusTraversable: // Overridden from FocusTraversable:
views::FocusSearch* GetFocusSearch() override; views::FocusSearch* GetFocusSearch() override;
FocusTraversable* GetFocusTraversableParent() override;
View* GetFocusTraversableParentView() override;
// Overridden from app_list::ApplicationDragAndDropHost: // Overridden from app_list::ApplicationDragAndDropHost:
void CreateDragIconProxy(const gfx::Point& location_in_screen_coordinates, void CreateDragIconProxy(const gfx::Point& location_in_screen_coordinates,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment