diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 07:25:14 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 07:25:14 +0000 |
| commit | 6820de76330215c96acc849b74a14fcf2b859914 (patch) | |
| tree | e3b2af7588be3fc1ac4112138e8f480fbc7e47a3 /ash | |
| parent | 65c2ce585955d84b1f9abb1677edd21505ba0df1 (diff) | |
| download | chromium_src-6820de76330215c96acc849b74a14fcf2b859914.zip chromium_src-6820de76330215c96acc849b74a14fcf2b859914.tar.gz chromium_src-6820de76330215c96acc849b74a14fcf2b859914.tar.bz2 | |
Revert 133408 - Add accessibility info to app list items and allow them to be focused.
R=mukai@chromium.org
BUG=120496
TEST=See Bug
Review URL: http://codereview.chromium.org/9985005
TBR=zork@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10161021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/app_list/app_list_item_view.cc | 8 | ||||
| -rw-r--r-- | ash/app_list/app_list_item_view.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/ash/app_list/app_list_item_view.cc b/ash/app_list/app_list_item_view.cc index dc6d247..c9e7492 100644 --- a/ash/app_list/app_list_item_view.cc +++ b/ash/app_list/app_list_item_view.cc @@ -13,7 +13,6 @@ #include "base/synchronization/cancellation_flag.h" #include "base/threading/worker_pool.h" #include "base/utf_string_conversions.h" -#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" @@ -204,7 +203,6 @@ AppListItemView::AppListItemView(AppListModelView* list_model_view, set_context_menu_controller(this); set_request_focus_on_press(false); - set_focusable(true); } AppListItemView::~AppListItemView() { @@ -253,7 +251,6 @@ void AppListItemView::SetSelected(bool selected) { if (selected == selected_) return; - RequestFocus(); selected_ = selected; SchedulePaint(); } @@ -363,11 +360,6 @@ void AppListItemView::OnPaint(gfx::Canvas* canvas) { } } -void AppListItemView::GetAccessibleState(ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; - state->name = UTF8ToUTF16(model_->title()); -} - void AppListItemView::ShowContextMenuForView(views::View* source, const gfx::Point& point) { ui::MenuModel* menu_model = model_->GetContextMenuModel(); diff --git a/ash/app_list/app_list_item_view.h b/ash/app_list/app_list_item_view.h index d867d31..e085b42 100644 --- a/ash/app_list/app_list_item_view.h +++ b/ash/app_list/app_list_item_view.h @@ -79,7 +79,6 @@ class ASH_EXPORT AppListItemView : public views::CustomButton, virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void Layout() OVERRIDE; virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual void GetAccessibleState(ui::AccessibleViewState* state); // views::ContextMenuController overrides: virtual void ShowContextMenuForView(views::View* source, |