Instant Extended: Add prominent search term support

chrome/browser/ui/views/location_bar/location_bar_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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 409 matching lines @@
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE_FROM_STAR,
                                          star_enabled);
   if (star_view_ && !extensions::FeatureSwitch::action_box()->IsEnabled())
     star_view_->SetVisible(star_enabled);
 
   if (action_box_button_view_)
     action_box_button_view_->SetVisible(!model_->GetInputInProgress());
 
   string16 search_provider;
   if (!model_->GetInputInProgress() &&
-      model_->WouldReplaceSearchURLWithSearchTerms()) {
+      model_->GetSearchTermType() != ToolbarModel::SEARCH_TERM_NONE) {

[Peter Kasting, 2013/04/25 19:42:54]

Nit: File style: parens around binary subexpressions

[sail, 2013/04/25 22:18:46]

Done.

     const TemplateURL* template_url =
         TemplateURLServiceFactory::GetForProfile(profile_)->
             GetDefaultSearchProvider();
     if (template_url && !template_url->short_name().empty()) {
       search_provider = l10n_util::GetStringFUTF16(
           IDS_OMNIBOX_SEARCH_TOKEN_TEXT, template_url->short_name());
       search_token_view_->SetBackgroundColor(GetColor(
           model_->GetSecurityLevel(), LocationBarView::BACKGROUND));
       SkColor text_color = GetColor(
           model_->GetSecurityLevel(), LocationBarView::DEEMPHASIZED_TEXT);
@@ skipping 1023 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }