alternate ntp: implement right-aligned search token

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 12 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_prompt_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
@@ skipping 139 matching lines @@
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
       suggested_text_view_(NULL),
       keyword_hint_view_(NULL),
       zoom_view_(NULL),
       open_pdf_in_reader_view_(NULL),
       script_bubble_icon_view_(NULL),
       star_view_(NULL),
       web_intents_button_view_(NULL),
       action_box_button_view_(NULL),
+      search_bubble_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       animation_offset_(0) {
   set_id(VIEW_ID_LOCATION_BAR);
 
   if (mode_ == NORMAL) {
     background_painter_.reset(
         views::Painter::CreateImagePainter(
             *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
@@ skipping 96 matching lines @@
   AddChildView(script_bubble_icon_view_);
   script_bubble_icon_view_->SetVisible(false);
 
   if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
     // Note: condition above means that the star icon is hidden in popups and in
     // the app launcher.
     star_view_ = new StarView(command_updater_);
     AddChildView(star_view_);
     star_view_->SetVisible(true);
   }
+
   if (extensions::FeatureSwitch::action_box()->IsEnabled() &&
       mode_ == NORMAL && browser_) {
     action_box_button_view_ = new ActionBoxButtonView(browser_,
         gfx::Point(kNormalHorizontalEdgeThickness, kVerticalEdgeThickness));
     AddChildView(action_box_button_view_);
 
     if (star_view_)
       star_view_->SetVisible(false);
   }
 
+  if (chrome::search::IsInstantExtendedAPIEnabled(profile_)) {

[Peter Kasting, 2012/12/05 21:13:20]

I don't think you should check this here.  Let the code that controls replacing
the URL with the search terms decide when that is appropriate to trigger.  The
location bar view should just be a dumb handler for that state.

Also, this block should go right after the keyword hint view block.

[kuan, 2012/12/11 21:10:29]

Done.

+    search_bubble_view_ = new IconLabelBubbleView(
+        kSelectedKeywordBackgroundImages, -1,
+        GetColor(ToolbarModel::NONE, TEXT));
+    AddChildView(search_bubble_view_);
+    search_bubble_view_->SetFont(font_);
+    search_bubble_view_->SetVisible(false);
+  }
+
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED,
                  content::Source<Profile>(profile_));
 
   // Initialize the location entry. We do this to avoid a black flash which is
   // visible when the location entry has just been initialized.
   Update(NULL);
 
   OnChanged();
 }
@@ skipping 399 matching lines @@
     entry_width -= zoom_view_->GetPreferredSize().width() + GetItemPadding();
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     if ((*i)->visible())
       entry_width -= ((*i)->GetPreferredSize().width() + GetItemPadding());
   }
   if (web_intents_button_view_->visible()) {
     entry_width -= web_intents_button_view_->GetPreferredSize().width() +
         GetItemPadding();
   }
+  if (search_bubble_view_) {

[Peter Kasting, 2012/12/05 21:13:20]

This conditional can be removed once you make the change suggested above.

[kuan, 2012/12/11 21:10:29]

Done.

+    search_bubble_view_->SetVisible(false);

[Peter Kasting, 2012/12/05 21:13:20]

You should be controlling the visibility of this object in Update(), not
Layout().

[kuan, 2012/12/11 21:10:29]

Done.

+    if (model_->GetSecurityLevel() == ToolbarModel::SECURE &&

[Peter Kasting, 2012/12/05 21:13:20]

Nit: Again, I don't think you should check this.  Leave WouldReplace...() to do
that.  Besides, this check isn't even correct: you missed the EV_SECURE case.

[kuan, 2012/12/11 21:10:29]

Done.

+        model_->WouldReplaceSearchURLWithSearchTerms()) {
+      const TemplateURL* template_url =
+          TemplateURLServiceFactory::GetForProfile(profile_)->
+              GetDefaultSearchProvider();
+      if (template_url) {
+        search_bubble_view_->SetLabel(l10n_util::GetStringFUTF16(
+            IDS_OMNIBOX_EV_SEARCH_TEXT, template_url->short_name()));
+        search_bubble_view_->SetVisible(true);
+        entry_width -= search_bubble_view_->GetPreferredSize().width() +
+                       GetItemPadding();
+      }
+    }
+  }
   // The gap between the edit and whatever is to its right is shortened.
   entry_width += kEditInternalSpace;
 
   // Size the EV bubble after taking star/page actions/content settings out of
   // |entry_width| so we won't take too much space.
   if (ev_bubble_width) {
     // Try to elide the bubble to be no larger than half the total available
     // space, but never elide it any smaller than 150 px.
     static const int kMinElidedBubbleWidth = 150;
     static const double kMaxBubbleFraction = 0.5;
@@ skipping 113 matching lines @@
     offset += web_intents_button_view_->GetBuiltInHorizontalPadding();
     int width = web_intents_button_view_->GetPreferredSize().width();
     offset -= width;
     web_intents_button_view_->SetBounds(
         offset, location_y + kBubbleVerticalPadding, width,
         web_intents_button_view_->GetPreferredSize().height());
     offset -= GetItemPadding() -
               web_intents_button_view_->GetBuiltInHorizontalPadding();
   }
 
+  // Now the search bubble view.
+  if (search_bubble_view_ && search_bubble_view_->visible()) {
+    gfx::Size size = search_bubble_view_->GetPreferredSize();
+    offset -= size.width();
+    search_bubble_view_->SetBounds(offset, location_y + kBubbleVerticalPadding,
+        size.width(), size.height());
+    offset -= GetItemPadding();
+  }
+
   // Now lay out items to the left of the edit field.
   if (location_icon_view_->visible()) {
     location_icon_view_->SetBounds(
         kEdgeThickness + GetEdgeItemPadding() -
         location_icon_view_->GetBuiltInHorizontalPadding(),
         location_y, location_icon_width, location_height);
     offset = location_icon_view_->bounds().right() + kItemEditPadding -
         location_icon_view_->GetBuiltInHorizontalPadding();
   } else if (ev_bubble_view_->visible()) {
     ev_bubble_view_->SetBounds(kEdgeThickness + kBubbleHorizontalPadding,
@@ skipping 691 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();
 }