[SiteChip] Remove 50% width cap for site chip

chrome/browser/ui/views/toolbar/site_chip_view.cc

 // Copyright 2013 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/toolbar/site_chip_view.h"
 
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/elide_url.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 325 matching lines @@
   base::string16 host = SiteLabelFromURL(url_displayed_);
   if (security_level_ == ToolbarModel::EV_SECURE) {
     host = l10n_util::GetStringFUTF16(IDS_SITE_CHIP_EV_SSL_LABEL,
         toolbar_view_->GetToolbarModel()->GetEVCertName(),
         host);
   }
 
   host_label_->SetText(host);
   host_label_->SetTooltipText(host);
   host_label_->SetBackgroundColor(label_background);
+  host_label_->SetElideBehavior(views::Label::NO_ELIDE);
 
   int icon = toolbar_view_->GetToolbarModel()->GetIconForSecurityLevel(
       security_level_);
   showing_16x16_icon_ = false;
 
   if (url_displayed_.is_empty() ||
       url_displayed_.SchemeIs(chrome::kChromeUIScheme)) {
     icon = IDR_PRODUCT_LOGO_16;
     showing_16x16_icon_ = true;
   }
@@ skipping 63 matching lines @@
 }
 
 void SiteChipView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect rect(GetLocalBounds());
   if (painter_)
     views::Painter::PaintPainterAt(canvas, painter_, rect);
 
   ToolbarButton::OnPaint(canvas);
 }
 
+int SiteChipView::ElideDomainTarget(int target_max_width) {
+  base::string16 host = SiteLabelFromURL(url_displayed_);
+  host_label_->SetText(host);
+  int width = GetPreferredSize().width();
+  if (width <= target_max_width)
+    return width;
+
+  gfx::Size label_size = host_label_->GetPreferredSize();
+  int padding_width = width - label_size.width();
+
+  base::string16 elided_host = ElideHost(

[Peter Kasting, 2014/02/05 00:42:49]

What is ElideHost() a reference to?

Nit: I'd just inline this into the next statement

[Greg Billock, 2014/02/05 18:32:05]

This is the new functionality I've placed in the text elider (now in elide_url).
sounds good.

[Peter Kasting, 2014/02/05 21:08:08]

OK.  I don't know that I'm hugely keen on it being a global function, but
whatever.

Note: Reading ElideHost()'s header comment, something is confusing:

// ...leading-elide the domain name to fit the width.
// Example: http://sub.domain.com ---> ..."s...domain.com"

The description says "leading-elide", but the example does middle-eliding.

[Greg Billock, 2014/02/06 17:38:51]

It shares a great deal of code with ElideUrl, as you'd expect.
Thanks. Yeah, that's just wrong. I'll fix it.

+      toolbar_view_->GetToolbarModel()->GetURL(),
+      host_label_->font_list(), target_max_width - padding_width);
+  host_label_->SetText(elided_host);
+  return GetPreferredSize().width();
+}
+
 // TODO(gbillock): Make the LocationBarView or OmniboxView the listener for
 // this button.
 void SiteChipView::ButtonPressed(views::Button* sender,
                                  const ui::Event& event) {
   // See if the event needs to be passed to the LocationIconView.
   if (event.IsMouseEvent() || (event.type() == ui::ET_GESTURE_TAP)) {
     location_icon_view_->set_interactive(true);
     const ui::LocatedEvent& located_event =
         static_cast<const ui::LocatedEvent&>(event);
     if (GetEventHandlerForPoint(located_event.location()) ==
@@ skipping 43 matching lines @@
 
 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will
 // have already been called.
 void SiteChipView::OnSafeBrowsingHit(
     const SafeBrowsingUIManager::UnsafeResource& resource) {}
 
 void SiteChipView::OnSafeBrowsingMatch(
     const SafeBrowsingUIManager::UnsafeResource& resource) {
   OnChanged();
 }