Launcher Search box, Back and Mic buttons now focusable in ChromeVox.

ui/app_list/views/search_box_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 "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_menu_views.h"
+#include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/resources/grit/ui_resources.h"
+#include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/shadow_border.h"
 
 namespace app_list {
@@ skipping 42 matching lines @@
       : ImageButton(listener), selected_(false) {}
   ~SearchBoxImageButton() override {}
 
   bool selected() { return selected_; }
   void SetSelected(bool selected) {
     if (selected_ == selected)
       return;
 
     selected_ = selected;
     SchedulePaint();
+    if (selected)
+      NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
   }
 
   bool OnKeyPressed(const ui::KeyEvent& event) override {
     // Disable space key to press the button. The keyboard events received
     // by this view are forwarded from a Textfield (SearchBoxView) and key
     // released events are not forwarded. This leaves the button in pressed
     // state.
     if (event.key_code() == ui::VKEY_SPACE)
       return false;
 
@@ skipping 30 matching lines @@
 
   if (switches::IsExperimentalAppListEnabled()) {
     SetShadow(GetShadowForZHeight(2));
     back_button_ = new SearchBoxImageButton(this);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     back_button_->SetImage(
         views::ImageButton::STATE_NORMAL,
         rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
     back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                     views::ImageButton::ALIGN_MIDDLE);
+    base::string16 back_title(l10n_util::GetStringUTF16(IDS_APP_LIST_BACK));
+    back_button_->SetAccessibleName(back_title);
+    back_button_->SetTooltipText(back_title);
     content_container_->AddChildView(back_button_);
 
     content_container_->set_background(new ExperimentalSearchBoxBackground());
   } else {
     set_background(
         views::Background::CreateSolidBackground(kSearchBoxBackground));
     SetBorder(
         views::Border::CreateSolidSidedBorder(0, 0, 1, 0, kTopSeparatorColor));
     icon_view_ = new views::ImageView;
     content_container_->AddChildView(icon_view_);
@@ skipping 108 matching lines @@
     case FOCUS_CONTENTS_VIEW:
       focused_view_ = move_backwards
           ? (speech_button_ && speech_button_->visible() ?
               FOCUS_MIC_BUTTON : FOCUS_SEARCH_BOX)
           : FOCUS_CONTENTS_VIEW;
       break;
     default:
       DCHECK(false);
   }
 
-  if (back_button_ && focused_view_ == FOCUS_BACK_BUTTON)
-    back_button_->SetSelected(true);
-  if (speech_button_ && focused_view_ == FOCUS_MIC_BUTTON)
-    speech_button_->SetSelected(true);
+  switch (focused_view_) {
+    case FOCUS_BACK_BUTTON:
+      if (back_button_)
+        back_button_->SetSelected(true);
+      break;
+    case FOCUS_SEARCH_BOX:
+      // Set the ChromeVox focus to the search box. However, DO NOT do this if
+      // we are in the search results state, because the focus is about to be
+      // shifted to the first search result and we do not want to read out the
+      // name of the search box as well.
+      if (!contents_view_->IsStateActive(AppListModel::STATE_SEARCH_RESULTS))
+        search_box_->NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
+      break;
+    case FOCUS_MIC_BUTTON:
+      if (speech_button_)
+        speech_button_->SetSelected(true);
+      break;
+    default:
+      break;
+  }
 
   if (focused_view_ < FOCUS_CONTENTS_VIEW)
     delegate_->SetSearchResultSelection(focused_view_ == FOCUS_SEARCH_BOX);
 
   return (focused_view_ < FOCUS_CONTENTS_VIEW);
 }
 
 void SearchBoxView::ResetTabFocus(bool on_contents) {
   if (back_button_)
     back_button_->SetSelected(false);
@@ skipping 104 matching lines @@
 
 void SearchBoxView::SpeechRecognitionButtonPropChanged() {
   const SearchBoxModel::SpeechButtonProperty* speech_button_prop =
       model_->search_box()->speech_button();
   if (speech_button_prop) {
     if (!speech_button_) {
       speech_button_ = new SearchBoxImageButton(this);
       content_container_->AddChildView(speech_button_);
     }
 
+    speech_button_->SetAccessibleName(speech_button_prop->accessible_name);
     if (view_delegate_->GetSpeechUI()->state() ==
         SPEECH_RECOGNITION_HOTWORD_LISTENING) {
       speech_button_->SetImage(
           views::Button::STATE_NORMAL, &speech_button_prop->on_icon);
       speech_button_->SetTooltipText(speech_button_prop->on_tooltip);
     } else {
       speech_button_->SetImage(
           views::Button::STATE_NORMAL, &speech_button_prop->off_icon);
       speech_button_->SetTooltipText(speech_button_prop->off_tooltip);
     }
@@ skipping 22 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list