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

Unified Diff: chrome/browser/ui/omnibox/omnibox_view.cc

Issue 1104513003: Omnibox: Remove Hint Text Code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed WITH_DEFAULT_SEARCH_PROVIDER part of string Created 5 years, 8 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 | « chrome/browser/ui/omnibox/omnibox_view.h ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/omnibox/omnibox_view.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc
index f66cff677cc2366ade5188bce373d1f8d2f4f154..833cdfa7aa96a404c33c1b2a0acba7cf5ef0b944 100644
--- a/chrome/browser/ui/omnibox/omnibox_view.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view.cc
@@ -115,31 +115,6 @@ int OmniboxView::GetIcon() const {
return (id == IDR_OMNIBOX_HTTP) ? IDR_LOCATION_BAR_HTTP : id;
}
-base::string16 OmniboxView::GetHintText() const {
- // If the user is in keyword mode (the "Search <some site>:" chip is showing)
- // then it doesn't make sense to show the "Search <default search engine>"
- // hint text.
- if (model_->is_keyword_selected())
- return base::string16();
-
- // Attempt to determine the default search provider and use that in the hint
- // text.
- TemplateURLService* template_url_service =
- TemplateURLServiceFactory::GetForProfile(model_->profile());
- if (template_url_service) {
- TemplateURL* template_url =
- template_url_service->GetDefaultSearchProvider();
- if (template_url)
- return l10n_util::GetStringFUTF16(
- IDS_OMNIBOX_EMPTY_HINT_WITH_DEFAULT_SEARCH_PROVIDER,
- template_url->AdjustedShortNameForLocaleDirection());
- }
-
- // Otherwise return a hint based on there being no default search provider.
- return l10n_util::GetStringUTF16(
- IDS_OMNIBOX_EMPTY_HINT_NO_DEFAULT_SEARCH_PROVIDER);
-}
-
void OmniboxView::SetUserText(const base::string16& text) {
SetUserText(text, text, true);
}
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view.h ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698