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 27 matching lines @@
 #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_bar_layout.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/script_bubble_icon_view.h"
+#include "chrome/browser/ui/views/location_bar/search_token_view.h"
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/web_intents_button_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_views.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/feature_switch.h"
@@ skipping 11 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "ui/native_theme/native_theme_win.h"
 #endif
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #endif
 
@@ skipping 82 matching lines @@
       disposition_(CURRENT_TAB),
       transition_(content::PageTransitionFromInt(
           content::PAGE_TRANSITION_TYPED |
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
       suggested_text_view_(NULL),
       keyword_hint_view_(NULL),
+      search_token_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),
       mode_(mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       animation_offset_(0) {
@@ skipping 33 matching lines @@
     // Use a larger version of the system font.
     font_ = rb.GetFont(ui::ResourceBundle::MediumFont);
   }
 
   // If this makes the font too big, try to make it smaller so it will fit.
   const int height = GetInternalHeight(true);
   while ((font_.GetHeight() > height) && (font_.GetFontSize() > 1))
     font_ = font_.DeriveFont(-1);
 
   location_icon_view_ = new LocationIconView(this);
-  AddChildView(location_icon_view_);
   location_icon_view_->SetVisible(true);
   location_icon_view_->set_drag_controller(this);
+  AddChildView(location_icon_view_);
 
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
                        GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT),
                        this);
-  AddChildView(ev_bubble_view_);
   ev_bubble_view_->SetVisible(false);
   ev_bubble_view_->set_drag_controller(this);
+  AddChildView(ev_bubble_view_);
 
   // URL edit field.
   // View container for URL edit field.
   location_entry_.reset(CreateOmniboxView(this, model_, profile_,
       command_updater_, mode_ == POPUP, this));
   SetLocationEntryFocusable(true);
 
   location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
       GetColor(ToolbarModel::NONE, TEXT),
       profile_);
+  selected_keyword_view_->SetVisible(false);
+  selected_keyword_view_->SetFont(font_);
   AddChildView(selected_keyword_view_);
-  selected_keyword_view_->SetFont(font_);
-  selected_keyword_view_->SetVisible(false);
 
   keyword_hint_view_ = new KeywordHintView(profile_, this);
-  AddChildView(keyword_hint_view_);
   keyword_hint_view_->SetVisible(false);
   keyword_hint_view_->SetFont(font_);
+  AddChildView(keyword_hint_view_);
+
+  search_token_view_ = new SearchTokenView(this);
+  search_token_view_->SetVisible(false);
+  search_token_view_->SetFont(font_);
+  AddChildView(search_token_view_);
 
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     ContentSettingImageView* content_blocked_view =
         new ContentSettingImageView(static_cast<ContentSettingsType>(i),
                                     kCSBubbleBackgroundImages, this,
                                     font_,
                                     GetColor(ToolbarModel::NONE, TEXT));
     content_setting_views_.push_back(content_blocked_view);
+    content_blocked_view->SetVisible(false);
     AddChildView(content_blocked_view);
-    content_blocked_view->SetVisible(false);
   }
 
   zoom_view_ = new ZoomView(model_, delegate_);
   zoom_view_->set_id(VIEW_ID_ZOOM_BUTTON);
   AddChildView(zoom_view_);
 
   web_intents_button_view_ =
       new WebIntentsButtonView(this, kWIBubbleBackgroundImages, font_,
                                GetColor(ToolbarModel::NONE, TEXT));
   AddChildView(web_intents_button_view_);
 
   open_pdf_in_reader_view_ = new OpenPDFInReaderView(this);
   AddChildView(open_pdf_in_reader_view_);
 
   script_bubble_icon_view_ = new ScriptBubbleIconView(delegate());
+  script_bubble_icon_view_->SetVisible(false);
   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_);
+    star_view_->SetVisible(true);
     AddChildView(star_view_);
-    star_view_->SetVisible(true);
   }
   if (extensions::FeatureSwitch::action_box()->IsEnabled() &&
       mode_ == NORMAL && browser_) {
+    if (star_view_)
+      star_view_->SetVisible(false);
+
     action_box_button_view_ = new ActionBoxButtonView(browser_,
         gfx::Point(kNormalHorizontalEdgeThickness, kVerticalEdgeThickness));
     AddChildView(action_box_button_view_);
-
-    if (star_view_)
-      star_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);
 
@@ skipping 98 matching lines @@
 
   bool star_enabled = star_view_ && !model_->GetInputInProgress() &&
                       edit_bookmarks_enabled_.GetValue();
 
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE_FROM_STAR,
                                          star_enabled);
   if (star_view_ && !extensions::FeatureSwitch::action_box()->IsEnabled())
     star_view_->SetVisible(star_enabled);
 
+  string16 search_provider;
+  if (!model_->GetInputInProgress() &&
+      model_->WouldReplaceSearchURLWithSearchTerms()) {
+    const TemplateURL* template_url =
+        TemplateURLServiceFactory::GetForProfile(profile_)->
+            GetDefaultSearchProvider();
+    if (template_url) {
+      search_provider = template_url->short_name();
+      search_token_view_->SetBackgroundColor(GetColor(
+          model_->GetSecurityLevel(), LocationBarView::BACKGROUND));
+      search_token_view_->SetForegroundColor(GetColor(
+          model_->GetSecurityLevel(), LocationBarView::DEEMPHASIZED_TEXT));
+    }
+  }
+  search_token_view_->SetSearchProvider(search_provider);
+
   // Don't Update in app launcher mode so that the location entry does not show
   // a URL or security background.
   if (mode_ != APP_LAUNCHER)
     location_entry_->Update(tab_for_state_restoring);
   OnChanged();
 }
 
 void LocationBarView::UpdateContentSettingsIcons() {
   RefreshContentSettingViews();
 
@@ skipping 228 matching lines @@
 
   LocationBarLayout left_decorations(LocationBarLayout::LEFT_EDGE,
                                      kItemEditPadding, kEdgeEditPadding);
   LocationBarLayout right_decorations(LocationBarLayout::RIGHT_EDGE,
                                       kItemEditPadding, kEdgeEditPadding);
 
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
   ev_bubble_view_->SetVisible(false);
   keyword_hint_view_->SetVisible(false);
+  search_token_view_->SetVisible(false);
 
   const string16 keyword(location_entry_->model()->keyword());
   const bool is_keyword_hint(location_entry_->model()->is_keyword_hint());
   const bool show_selected_keyword = !keyword.empty() && !is_keyword_hint;
   const bool show_keyword_hint = !keyword.empty() && is_keyword_hint;

[beaudoin, 2013/01/07 17:27:53]

It probably does not make sense to show the keyword or keyword hint when
search_token_view_ is visible but I don't see any logic preventing that from
happening.

You should probably add logic here so that show_selected_keyword and
show_keyword_hint are always false when
search_token_view_->has_search_provider() is true.

[kuan, 2013/01/09 19:52:58]

Done.

   if (show_selected_keyword) {
     left_decorations.AddDecoration(
         kBubbleLocationY, 0, true, 0, kBubbleHorizontalPadding,
         GetItemPadding(), 0, selected_keyword_view_);
     if (selected_keyword_view_->keyword() != keyword) {
       selected_keyword_view_->SetKeyword(keyword);
       const TemplateURL* template_url =
           TemplateURLServiceFactory::GetForProfile(profile_)->
           GetTemplateURLForKeyword(keyword);
       if (template_url && template_url->IsExtensionKeyword()) {
@@ skipping 65 matching lines @@
         web_intents_button_view_->GetBuiltInHorizontalPadding(),
         web_intents_button_view_);
   }
   if (show_keyword_hint) {
     right_decorations.AddDecoration(
         kVerticalEdgeThickness, 0, true, 0, GetEdgeItemPadding(),
         GetItemPadding(), 0, keyword_hint_view_);
     if (keyword_hint_view_->keyword() != keyword)
       keyword_hint_view_->SetKeyword(keyword);
   }
+  if (search_token_view_->has_search_provider()) {

[beaudoin, 2013/01/07 17:27:53]

Add a comment to indicate this must absolutely be the last item of the
right_decorations list, otherwise set_item_edit_padding() makes no sense.

[kuan, 2013/01/09 19:52:58]

Done.

+    right_decorations.AddDecoration(
+        kVerticalEdgeThickness, location_height, true, 0, GetEdgeItemPadding(),
+        GetItemPadding(), 0, search_token_view_);

[beaudoin, 2013/01/07 22:18:40]

"true" means this component is auto-collapsible. Are you sure this is what you
want? If so, you'll probably have to add some logic if you extract the separator
as a separate decoration.

[kuan, 2013/01/09 19:52:58]

Done.  yes, it is auto-collapsible.

+    right_decorations.set_item_edit_padding(
+        views::kUnrelatedControlLargeHorizontalSpacing);
+  }
 
   // Perform layout.
   int full_width = width() - 2 * kEdgeThickness;
   int entry_width = full_width;
   left_decorations.LayoutPass1(&entry_width);
   right_decorations.LayoutPass1(&entry_width);
   left_decorations.LayoutPass2(&entry_width);
   right_decorations.LayoutPass2(&entry_width);
 
   int available_width = entry_width - location_entry_->TextWidth();
@@ skipping 657 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();
 }