OLD | NEW |
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 #include "ui/app_list/views/search_box_view.h" | 5 #include "ui/app_list/views/search_box_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ui/app_list/app_list_constants.h" | 9 #include "ui/app_list/app_list_constants.h" |
10 #include "ui/app_list/app_list_model.h" | 10 #include "ui/app_list/app_list_model.h" |
11 #include "ui/app_list/app_list_switches.h" | 11 #include "ui/app_list/app_list_switches.h" |
12 #include "ui/app_list/app_list_view_delegate.h" | 12 #include "ui/app_list/app_list_view_delegate.h" |
13 #include "ui/app_list/search_box_model.h" | 13 #include "ui/app_list/search_box_model.h" |
14 #include "ui/app_list/speech_ui_model.h" | 14 #include "ui/app_list/speech_ui_model.h" |
15 #include "ui/app_list/views/app_list_menu_views.h" | 15 #include "ui/app_list/views/app_list_menu_views.h" |
16 #include "ui/app_list/views/contents_view.h" | 16 #include "ui/app_list/views/contents_view.h" |
17 #include "ui/app_list/views/search_box_view_delegate.h" | 17 #include "ui/app_list/views/search_box_view_delegate.h" |
| 18 #include "ui/base/ime/text_input_flags.h" |
18 #include "ui/base/l10n/l10n_util.h" | 19 #include "ui/base/l10n/l10n_util.h" |
19 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
20 #include "ui/events/event.h" | 21 #include "ui/events/event.h" |
21 #include "ui/gfx/canvas.h" | 22 #include "ui/gfx/canvas.h" |
22 #include "ui/gfx/shadow_value.h" | 23 #include "ui/gfx/shadow_value.h" |
23 #include "ui/resources/grit/ui_resources.h" | 24 #include "ui/resources/grit/ui_resources.h" |
24 #include "ui/strings/grit/ui_strings.h" | 25 #include "ui/strings/grit/ui_strings.h" |
25 #include "ui/views/border.h" | 26 #include "ui/views/border.h" |
26 #include "ui/views/controls/button/image_button.h" | 27 #include "ui/views/controls/button/image_button.h" |
27 #include "ui/views/controls/button/menu_button.h" | 28 #include "ui/views/controls/button/menu_button.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 kInnerPadding - views::Textfield::kTextPadding); | 157 kInnerPadding - views::Textfield::kTextPadding); |
157 content_container_->SetLayoutManager(layout); | 158 content_container_->SetLayoutManager(layout); |
158 layout->set_cross_axis_alignment( | 159 layout->set_cross_axis_alignment( |
159 views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER); | 160 views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER); |
160 layout->set_minimum_cross_axis_size(kPreferredHeight); | 161 layout->set_minimum_cross_axis_size(kPreferredHeight); |
161 | 162 |
162 search_box_->SetBorder(views::Border::NullBorder()); | 163 search_box_->SetBorder(views::Border::NullBorder()); |
163 search_box_->SetTextColor(kSearchTextColor); | 164 search_box_->SetTextColor(kSearchTextColor); |
164 search_box_->set_placeholder_text_color(kHintTextColor); | 165 search_box_->set_placeholder_text_color(kHintTextColor); |
165 search_box_->set_controller(this); | 166 search_box_->set_controller(this); |
| 167 search_box_->SetTextInputType(ui::TEXT_INPUT_TYPE_SEARCH); |
| 168 search_box_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF); |
166 content_container_->AddChildView(search_box_); | 169 content_container_->AddChildView(search_box_); |
167 layout->SetFlexForView(search_box_, 1); | 170 layout->SetFlexForView(search_box_, 1); |
168 | 171 |
169 #if !defined(OS_CHROMEOS) | 172 #if !defined(OS_CHROMEOS) |
170 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 173 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
171 menu_button_ = new views::MenuButton(NULL, base::string16(), this, false); | 174 menu_button_ = new views::MenuButton(NULL, base::string16(), this, false); |
172 menu_button_->SetBorder(views::Border::NullBorder()); | 175 menu_button_->SetBorder(views::Border::NullBorder()); |
173 menu_button_->SetImage(views::Button::STATE_NORMAL, | 176 menu_button_->SetImage(views::Button::STATE_NORMAL, |
174 *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL)); | 177 *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL)); |
175 menu_button_->SetImage(views::Button::STATE_HOVERED, | 178 menu_button_->SetImage(views::Button::STATE_HOVERED, |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 NotifyQueryChanged(); | 452 NotifyQueryChanged(); |
450 } | 453 } |
451 | 454 |
452 void SearchBoxView::OnSpeechRecognitionStateChanged( | 455 void SearchBoxView::OnSpeechRecognitionStateChanged( |
453 SpeechRecognitionState new_state) { | 456 SpeechRecognitionState new_state) { |
454 SpeechRecognitionButtonPropChanged(); | 457 SpeechRecognitionButtonPropChanged(); |
455 SchedulePaint(); | 458 SchedulePaint(); |
456 } | 459 } |
457 | 460 |
458 } // namespace app_list | 461 } // namespace app_list |
OLD | NEW |