Adjust elision of omnibox keyword search label.

chrome/browser/ui/views/location_bar/selected_keyword_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/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/ui/location_bar/location_bar_util.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/vector_icons.h"
 #include "components/search_engines/template_url_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/native_theme.h"
 
 SelectedKeywordView::SelectedKeywordView(const gfx::FontList& font_list,
                                          Profile* profile)
     : IconLabelBubbleView(font_list, false), profile_(profile) {
   full_label_.SetFontList(font_list);
   full_label_.SetVisible(false);
   partial_label_.SetFontList(font_list);
   partial_label_.SetVisible(false);
+  label()->SetElideBehavior(gfx::FADE_TAIL);
 }
 
 SelectedKeywordView::~SelectedKeywordView() {
 }
 
 void SelectedKeywordView::ResetImage() {
   SetImage(gfx::CreateVectorIcon(omnibox::kSearchIcon,
                                  LocationBarView::kIconWidth, GetTextColor()));
 }
 
 SkColor SelectedKeywordView::GetTextColor() const {
   return GetNativeTheme()->GetSystemColor(
       color_utils::IsDark(GetParentBackgroundColor())
           ? ui::NativeTheme::kColorId_TextfieldDefaultColor
           : ui::NativeTheme::kColorId_LinkEnabled);
 }
 
 gfx::Size SelectedKeywordView::GetPreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(full_label_.GetPreferredSize().width());
 }
 
 gfx::Size SelectedKeywordView::GetMinimumSize() const {
   // Height will be ignored by the LocationBarView.
-  return GetSizeForLabelWidth(partial_label_.GetMinimumSize().width());
+  return GetSizeForLabelWidth(0);
 }
 
 void SelectedKeywordView::Layout() {
-  SetLabel(((width() == GetPreferredSize().width()) ?
-      full_label_ : partial_label_).text());
+  // Keep showing the full label as long as there's more than enough width for
+  // the partial label. Otherwise there will be empty space displayed next to
+  // the partial label.
+  bool use_full_label =
+      width() >
+      GetSizeForLabelWidth(partial_label_.GetPreferredSize().width()).width();
+  SetLabel(use_full_label ? full_label_.text() : partial_label_.text());
+
   IconLabelBubbleView::Layout();
 }
 
 void SelectedKeywordView::SetKeyword(const base::string16& keyword) {
   keyword_ = keyword;
   if (keyword.empty())
     return;
   DCHECK(profile_);
   TemplateURLService* model =
       TemplateURLServiceFactory::GetForProfile(profile_);
   if (!model)
     return;
 
   bool is_extension_keyword;
   const base::string16 short_name =
       model->GetKeywordShortName(keyword, &is_extension_keyword);
   const base::string16 full_name =
       is_extension_keyword
           ? short_name
           : l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT_MD, short_name);
   full_label_.SetText(full_name);
 
-  const base::string16 min_string(
-      location_bar_util::CalculateMinString(short_name));
-  const base::string16 partial_name =
-      is_extension_keyword
-          ? min_string
-          : l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT_MD, min_string);
-  partial_label_.SetText(min_string.empty() ?
-      full_label_.text() : partial_name);
+  partial_label_.SetText(short_name);
 
   // Update the label now so ShouldShowLabel() works correctly when the parent
   // class is calculating the preferred size. It will be updated again in
   // Layout(), taking into account how much space has actually been allotted.
   SetLabel(full_name);
 }
 
 const char* SelectedKeywordView::GetClassName() const {
   return "SelectedKeywordView";
 }