app_list: Add back the search icon and hint.

chrome/browser/ui/app_list/search/search_controller.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/app_list/search/search_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/ui/app_list/search/app_search_provider.h"
 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
 #include "chrome/browser/ui/app_list/search/omnibox_provider.h"
 #include "chrome/browser/ui/app_list/search/search_provider.h"
 #include "chrome/browser/ui/app_list/search/webstore_provider.h"
 #include "content/public/browser/user_metrics.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "ui/app_list/search_box_model.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace app_list {
 
 SearchController::SearchController(Profile* profile,
                                    SearchBoxModel* search_box,
                                    AppListModel::SearchResults* results,
                                    AppListControllerDelegate* list_controller)
   : profile_(profile),
     search_box_(search_box),
     list_controller_(list_controller),
     dispatching_query_(false),
     mixer_(new Mixer(results)) {
   Init();
 }
 
 SearchController::~SearchController() {}
 
 void SearchController::Init() {
+  search_box_->SetHintText(
+      l10n_util::GetStringUTF16(IDS_SEARCH_BOX_HINT));
+  search_box_->SetIcon(*ui::ResourceBundle::GetSharedInstance().
+      GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
+
   mixer_->Init();
 
   AddProvider(Mixer::MAIN_GROUP, scoped_ptr<SearchProvider>(
       new AppSearchProvider(profile_, list_controller_)).Pass());
   AddProvider(Mixer::OMNIBOX_GROUP, scoped_ptr<SearchProvider>(
       new OmniboxProvider(profile_)).Pass());
   AddProvider(Mixer::WEBSTORE_GROUP, scoped_ptr<SearchProvider>(
       new WebstoreProvider(profile_)).Pass());
 }
 
@@ skipping 57 matching lines @@
 }
 
 void SearchController::OnResultsChanged() {
   if (dispatching_query_)
     return;
 
   mixer_->MixAndPublish();
 }
 
 }  // namespace app_list