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

Unified Diff: chrome/browser/ui/app_list/search/search_controller.cc

Issue 15745009: app_list: Add back the search icon and hint. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/search/search_controller.cc
diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc
index 690522780d158e608c66e4bc75ae044f29a9bef6..758b94c9c810b327decf55fa40a72b628c65e217 100644
--- a/chrome/browser/ui/app_list/search/search_controller.cc
+++ b/chrome/browser/ui/app_list/search/search_controller.cc
@@ -17,7 +17,11 @@
#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 {
@@ -36,6 +40,11 @@ SearchController::SearchController(Profile* profile,
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>(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698