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

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

Issue 69813002: Adds the speech recognition button to the app-list searchbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ui/app_list/cocoa/apps_search_box_controller.mm ('k') | ui/app_list/search_box_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "ui/app_list/app_list_export.h" 11 #include "ui/app_list/app_list_export.h"
12 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
13 #include "ui/gfx/selection_model.h" 13 #include "ui/gfx/selection_model.h"
14 14
15 namespace app_list { 15 namespace app_list {
16 16
17 class SearchBoxModelObserver; 17 class SearchBoxModelObserver;
18 18
19 // SearchBoxModel consisits of an icon, a hint text, a user text and a selection 19 // SearchBoxModel consisits of an icon, a hint text, a user text and a selection
20 // model. The icon is rendered to the side of the query editor. The hint text 20 // model. The icon is rendered to the side of the query editor. The hint text
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 button with toggled status.
27 struct APP_LIST_EXPORT ToggleButtonProperty {
28 ToggleButtonProperty(const gfx::ImageSkia& icon,
29 const gfx::ImageSkia& toggled_icon,
30 const base::string16& tooltip,
31 const base::string16& toggled_tooltip);
32 ~ToggleButtonProperty();
33
34 gfx::ImageSkia icon;
35 gfx::ImageSkia toggled_icon;
36 base::string16 tooltip;
37 base::string16 toggled_tooltip;
38 };
39
26 SearchBoxModel(); 40 SearchBoxModel();
27 ~SearchBoxModel(); 41 ~SearchBoxModel();
28 42
29 // Sets/gets the icon on side of edit box. 43 // Sets/gets the icon on the left side of edit box.
30 void SetIcon(const gfx::ImageSkia& icon); 44 void SetIcon(const gfx::ImageSkia& icon);
31 const gfx::ImageSkia& icon() const { return icon_; } 45 const gfx::ImageSkia& icon() const { return icon_; }
32 46
47 // Sets/gets the properties for the button of speech recognition.
48 void SetSpeechRecognitionButton(
49 scoped_ptr<ToggleButtonProperty> speech_button);
50 const ToggleButtonProperty* speech_button() const {
51 return speech_button_.get();
52 }
53
54 // Sets the speech recognition button state.
55 void SetSpeechRecognitionButtonState(bool toggled);
56
33 // Sets/gets the hint text to display when there is in input. 57 // Sets/gets the hint text to display when there is in input.
34 void SetHintText(const base::string16& hint_text); 58 void SetHintText(const base::string16& hint_text);
35 const base::string16& hint_text() const { return hint_text_; } 59 const base::string16& hint_text() const { return hint_text_; }
36 60
37 // Sets/gets the selection model for the search box's Textfield. 61 // Sets/gets the selection model for the search box's Textfield.
38 void SetSelectionModel(const gfx::SelectionModel& sel); 62 void SetSelectionModel(const gfx::SelectionModel& sel);
39 const gfx::SelectionModel& selection_model() const { 63 const gfx::SelectionModel& selection_model() const {
40 return selection_model_; 64 return selection_model_;
41 } 65 }
42 66
43 // Sets/gets the text for the search box's Textfield. 67 // Sets/gets the text for the search box's Textfield.
44 void SetText(const base::string16& text); 68 void SetText(const base::string16& text);
45 const base::string16& text() const { return text_; } 69 const base::string16& text() const { return text_; }
46 70
47 void AddObserver(SearchBoxModelObserver* observer); 71 void AddObserver(SearchBoxModelObserver* observer);
48 void RemoveObserver(SearchBoxModelObserver* observer); 72 void RemoveObserver(SearchBoxModelObserver* observer);
49 73
50 private: 74 private:
51 gfx::ImageSkia icon_; 75 gfx::ImageSkia icon_;
76 scoped_ptr<ToggleButtonProperty> speech_button_;
52 base::string16 hint_text_; 77 base::string16 hint_text_;
53 gfx::SelectionModel selection_model_; 78 gfx::SelectionModel selection_model_;
54 base::string16 text_; 79 base::string16 text_;
55 80
56 ObserverList<SearchBoxModelObserver> observers_; 81 ObserverList<SearchBoxModelObserver> observers_;
57 82
58 DISALLOW_COPY_AND_ASSIGN(SearchBoxModel); 83 DISALLOW_COPY_AND_ASSIGN(SearchBoxModel);
59 }; 84 };
60 85
61 } // namespace app_list 86 } // namespace app_list
62 87
63 #endif // UI_APP_LIST_SEARCH_BOX_MODEL_H_ 88 #endif // UI_APP_LIST_SEARCH_BOX_MODEL_H_
OLDNEW
« no previous file with comments | « ui/app_list/cocoa/apps_search_box_controller.mm ('k') | ui/app_list/search_box_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698