| Index: chrome/browser/ui/app_list/search/search_resource_manager.cc
|
| diff --git a/chrome/browser/ui/app_list/search/search_resource_manager.cc b/chrome/browser/ui/app_list/search/search_resource_manager.cc
|
| index fcf3fa499219a1f60043ff5b2e689cdba27c5b5c..26703368ee87d01c683d84861e9d78d067197d29 100644
|
| --- a/chrome/browser/ui/app_list/search/search_resource_manager.cc
|
| +++ b/chrome/browser/ui/app_list/search/search_resource_manager.cc
|
| @@ -8,6 +8,7 @@
|
| #include "chrome/browser/ui/app_list/start_page_service.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "chrome/grit/theme_resources.h"
|
| +#include "ui/app_list/app_list_features.h"
|
| #include "ui/app_list/search_box_model.h"
|
| #include "ui/app_list/speech_ui_model.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -40,8 +41,10 @@ SearchResourceManager::SearchResourceManager(Profile* profile,
|
| speech_ui_(speech_ui) {
|
| speech_ui_->AddObserver(this);
|
|
|
| - search_box_->SetAccessibleName(
|
| - l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT));
|
| + fullscreen_app_list_enabled_ = features::IsFullscreenAppListEnabled();
|
| + search_box_->SetAccessibleName(l10n_util::GetStringUTF16(
|
| + fullscreen_app_list_enabled_ ? IDS_SEARCH_BOX_HINT_FULLSCREEN
|
| + : IDS_SEARCH_BOX_HINT));
|
| OnSpeechRecognitionStateChanged(speech_ui_->state());
|
| }
|
|
|
| @@ -51,9 +54,15 @@ SearchResourceManager::~SearchResourceManager() {
|
|
|
| void SearchResourceManager::OnSpeechRecognitionStateChanged(
|
| SpeechRecognitionState new_state) {
|
| - search_box_->SetHintText(l10n_util::GetStringUTF16(
|
| - (new_state == SPEECH_RECOGNITION_HOTWORD_LISTENING) ?
|
| - IDS_SEARCH_BOX_HOTWORD_HINT : IDS_SEARCH_BOX_HINT));
|
| + if (fullscreen_app_list_enabled_) {
|
| + search_box_->SetHintText(
|
| + l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT_FULLSCREEN));
|
| + } else {
|
| + search_box_->SetHintText(l10n_util::GetStringUTF16(
|
| + (new_state == SPEECH_RECOGNITION_HOTWORD_LISTENING)
|
| + ? IDS_SEARCH_BOX_HOTWORD_HINT
|
| + : IDS_SEARCH_BOX_HINT));
|
| + }
|
| search_box_->SetSpeechRecognitionButton(CreateNewProperty(new_state));
|
| }
|
|
|
|
|