Reland 9985005 with fix for clang

ash/app_list/app_list_item_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/app_list/app_list_item_view.h"
 
 #include "ash/app_list/app_list_item_model.h"
 #include "ash/app_list/app_list_model_view.h"
 #include "ash/app_list/drop_shadow_label.h"
 #include "ash/app_list/icon_cache.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #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"
 #include "ui/gfx/font.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ skipping 170 matching lines @@
 
   AddChildView(icon_);
   AddChildView(title_);
 
   ItemIconChanged();
   ItemTitleChanged();
   model_->AddObserver(this);
 
   set_context_menu_controller(this);
   set_request_focus_on_press(false);
+  set_focusable(true);
 }
 
 AppListItemView::~AppListItemView() {
   model_->RemoveObserver(this);
   CancelPendingIconOperation();
 }
 
 // static
 gfx::Size AppListItemView::GetPreferredSizeForIconSize(
     const gfx::Size& icon_size) {
@@ skipping 28 matching lines @@
 
   icon_size_ = size;
   title_->SetFont(GetTitleFontForIconSize(size));
   UpdateIcon();
 }
 
 void AppListItemView::SetSelected(bool selected) {
   if (selected == selected_)
     return;
 
+  RequestFocus();
   selected_ = selected;
   SchedulePaint();
 }
 
 void AppListItemView::UpdateIcon() {
   // Skip if |icon_size_| has not been determined.
   if (icon_size_.IsEmpty())
     return;
 
   SkBitmap icon = model_->icon();
@@ skipping 89 matching lines @@
     int alpha = SkColorGetA(kHoverAndPushedColor) *
         hover_animation_->GetCurrentValue();
     canvas->FillRect(rect, SkColorSetA(kHoverAndPushedColor, alpha));
   } else if (state() == BS_HOT || state() == BS_PUSHED) {
     canvas->FillRect(rect, kHoverAndPushedColor);
   } else if (selected_) {
     canvas->FillRect(rect, kSelectedColor);
   }
 }
 
+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();
   if (!menu_model)
     return;
 
   views::MenuModelAdapter menu_adapter(menu_model);
   context_menu_runner_.reset(
       new views::MenuRunner(new views::MenuItemView(&menu_adapter)));
   menu_adapter.BuildMenu(context_menu_runner_->GetMenu());
   if (context_menu_runner_->RunMenuAt(
           GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
           views::MenuItemView::TOPLEFT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
 }
 
 void AppListItemView::StateChanged() {
   if (state() == BS_HOT || state() == BS_PUSHED) {
     list_model_view_->SetSelectedItem(this);
   } else {
     list_model_view_->ClearSelectedItem(this);
     model_->SetHighlighted(false);
   }
 }
 
 }  // namespace ash