Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: ui/app_list/search_box_model.h

Issue 935293002: Launcher Search box, Back and Mic buttons now focusable in ChromeVox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tileitemview-setselected
Patch Set: Avoid using ContentsView (fix tests). Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_SEARCH_BOX_MODEL_H_ 5 #ifndef UI_APP_LIST_SEARCH_BOX_MODEL_H_
6 #define UI_APP_LIST_SEARCH_BOX_MODEL_H_ 6 #define UI_APP_LIST_SEARCH_BOX_MODEL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 10 matching lines...) Expand all
21 // is used as query edit control's placeholder text and displayed when there is 21 // is used as query edit control's placeholder text and displayed when there is
22 // no user text in the control. The selection model and the text represents the 22 // no user text in the control. The selection model and the text represents the
23 // text, cursor position and selected text in edit control. 23 // text, cursor position and selected text in edit control.
24 class APP_LIST_EXPORT SearchBoxModel { 24 class APP_LIST_EXPORT SearchBoxModel {
25 public: 25 public:
26 // The properties of the speech button. 26 // The properties of the speech button.
27 struct APP_LIST_EXPORT SpeechButtonProperty { 27 struct APP_LIST_EXPORT SpeechButtonProperty {
28 SpeechButtonProperty(const gfx::ImageSkia& on_icon, 28 SpeechButtonProperty(const gfx::ImageSkia& on_icon,
29 const base::string16& on_tooltip, 29 const base::string16& on_tooltip,
30 const gfx::ImageSkia& off_icon, 30 const gfx::ImageSkia& off_icon,
31 const base::string16& off_tooltip); 31 const base::string16& off_tooltip,
32 const base::string16& accessible_name);
32 ~SpeechButtonProperty(); 33 ~SpeechButtonProperty();
33 34
34 // The icon/tooltip when the hotword is on. 35 // The icon/tooltip when the hotword is on.
35 gfx::ImageSkia on_icon; 36 gfx::ImageSkia on_icon;
36 base::string16 on_tooltip; 37 base::string16 on_tooltip;
37 38
38 // The icon/tooltip when the hotword is off. 39 // The icon/tooltip when the hotword is off.
39 gfx::ImageSkia off_icon; 40 gfx::ImageSkia off_icon;
40 base::string16 off_tooltip; 41 base::string16 off_tooltip;
42
43 // The accessibility name of the button.
44 base::string16 accessible_name;
41 }; 45 };
42 46
43 SearchBoxModel(); 47 SearchBoxModel();
44 ~SearchBoxModel(); 48 ~SearchBoxModel();
45 49
46 // Sets/gets the icon on the left side of edit box. 50 // Sets/gets the icon on the left side of edit box.
47 void SetIcon(const gfx::ImageSkia& icon); 51 void SetIcon(const gfx::ImageSkia& icon);
48 const gfx::ImageSkia& icon() const { return icon_; } 52 const gfx::ImageSkia& icon() const { return icon_; }
49 53
50 // Sets/gets the properties for the button of speech recognition. 54 // Sets/gets the properties for the button of speech recognition.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 base::string16 text_; 88 base::string16 text_;
85 89
86 ObserverList<SearchBoxModelObserver> observers_; 90 ObserverList<SearchBoxModelObserver> observers_;
87 91
88 DISALLOW_COPY_AND_ASSIGN(SearchBoxModel); 92 DISALLOW_COPY_AND_ASSIGN(SearchBoxModel);
89 }; 93 };
90 94
91 } // namespace app_list 95 } // namespace app_list
92 96
93 #endif // UI_APP_LIST_SEARCH_BOX_MODEL_H_ 97 #endif // UI_APP_LIST_SEARCH_BOX_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/search/search_resource_manager.cc ('k') | ui/app_list/search_box_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698