Omnibox: Remove Hint Text Code

chrome/browser/ui/omnibox/omnibox_view.cc

 // Copyright (c) 2012 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.
 
 // This file defines helper functions shared by the various implementations
 // of OmniboxView.
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 
 #include "base/strings/string16.h"
@@ skipping 97 matching lines @@
 }
 
 int OmniboxView::GetIcon() const {
   if (!IsEditingOrEmpty())
     return controller_->GetToolbarModel()->GetIcon();
   int id = AutocompleteMatch::TypeToIcon(model_.get() ?
       model_->CurrentTextType() : AutocompleteMatchType::URL_WHAT_YOU_TYPED);
   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);
 }
 
 void OmniboxView::SetUserText(const base::string16& text,
                               const base::string16& display_text,
                               bool update_popup) {
   if (model_.get())
     model_->SetUserText(text);
   SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
@@ skipping 59 matching lines @@
   // |profile| can be NULL in tests.
   if (profile)
     model_.reset(new OmniboxEditModel(this, controller, profile));
 }
 
 void OmniboxView::TextChanged() {
   EmphasizeURLComponents();
   if (model_.get())
     model_->OnChanged();
 }