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

ui/app_list/views/search_box_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
 
 #include <string>
 
 #include "ui/app_list/search_box_model_observer.h"
@@ skipping 17 matching lines @@
 enum SearchBoxFocus {
   FOCUS_BACK_BUTTON,    // Back button, only responds to ENTER
   FOCUS_SEARCH_BOX,     // Nothing else has partial focus
   FOCUS_MIC_BUTTON,     // Mic button, only responds to ENTER
   FOCUS_CONTENTS_VIEW,  // Something outside the SearchBox is selected
 };
 
 class AppListMenuViews;
 class AppListModel;
 class AppListViewDelegate;
+class ContentsView;
 class SearchBoxModel;
 class SearchBoxViewDelegate;
 class SearchBoxImageButton;
 
 // SearchBoxView consists of an icon and a Textfield. SearchBoxModel is its data
 // model that controls what icon to display, what placeholder text to use for
 // Textfield. The text and selection model part could be set to change the
 // contents and selection model of the Textfield.
 class APP_LIST_EXPORT SearchBoxView : public views::View,
                                       public views::TextfieldController,
@@ skipping 15 matching lines @@
   void SetShadow(const gfx::ShadowValue& shadow);
 
   // Returns the bounds to use for the view (including the shadow) given the
   // desired bounds of the search box contents.
   gfx::Rect GetViewBoundsForSearchBoxContentsBounds(
       const gfx::Rect& rect) const;
 
   views::ImageButton* back_button();
   views::Textfield* search_box() { return search_box_; }
 
-  void set_contents_view(views::View* contents_view) {
+  void set_contents_view(ContentsView* contents_view) {

[calamity, 2015/02/20 03:45:25]

This will break tests.

[Matt Giuca, 2015/02/20 05:15:16]

Fixed. (As discussed, we just have to use text.empty() rather than more properly
looking at the ContentsView state.)

     contents_view_ = contents_view;
   }
 
   // Moves focus forward/backwards in response to TAB.
   bool MoveTabFocus(bool move_backwards);
 
   // Moves focus to contents or SearchBox and unselects buttons.
   void ResetTabFocus(bool on_contents);
 
   // Overridden from views::View:
@@ skipping 36 matching lines @@
   AppListModel* model_;  // Owned by the profile-keyed service.
 
   scoped_ptr<AppListMenuViews> menu_;
 
   views::View* content_container_;     // Owned by views hierarchy.
   views::ImageView* icon_view_;  // Owned by views hierarchy.
   SearchBoxImageButton* back_button_;    // Owned by views hierarchy.
   SearchBoxImageButton* speech_button_;  // Owned by views hierarchy.
   views::MenuButton* menu_button_;  // Owned by views hierarchy.
   views::Textfield* search_box_;  // Owned by views hierarchy.
-  views::View* contents_view_;  // Owned by views hierarchy.
+  ContentsView* contents_view_;          // Owned by views hierarchy.
 
   SearchBoxFocus focused_view_;  // Which element has TAB'd focus.
 
   DISALLOW_COPY_AND_ASSIGN(SearchBoxView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_