Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/views/location_bar/origin_chip_view.cc

 // Copyright 2014 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/origin_chip_view.h"
 
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 146 matching lines @@
 
   // TODO(gbillock): Would be nice to just use stock LabelButton stuff here.
   location_icon_view_ = new LocationIconView(location_bar_view_);
   // Make location icon hover events count as hovering the origin chip.
   location_icon_view_->set_interactive(false);
   location_icon_view_->ShowTooltip(true);
   AddChildView(location_icon_view_);
 
   ev_label_ = new views::Label(base::string16(), GetFontList());
   ev_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  ev_label_->SetElideBehavior(views::Label::NO_ELIDE);
+  ev_label_->SetElideBehavior(gfx::TRUNCATE);
   AddChildView(ev_label_);
 
   host_label_ = new views::Label(base::string16(), GetFontList());
   host_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  host_label_->SetElideBehavior(views::Label::NO_ELIDE);
+  host_label_->SetElideBehavior(gfx::TRUNCATE);
   AddChildView(host_label_);
 
   fade_in_animation_.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);
   fade_in_animation_.SetSlideDuration(175);
 }
 
 OriginChipView::~OriginChipView() {
   scoped_refptr<SafeBrowsingService> sb_service =
       g_browser_process->safe_browsing_service();
   if (sb_service.get() && sb_service->ui_manager())
@@ skipping 218 matching lines @@
 
 // Note: When OnSafeBrowsingHit would be called, OnSafeBrowsingMatch will
 // have already been called.
 void OriginChipView::OnSafeBrowsingHit(
     const SafeBrowsingUIManager::UnsafeResource& resource) {}
 
 void OriginChipView::OnSafeBrowsingMatch(
     const SafeBrowsingUIManager::UnsafeResource& resource) {
   OnChanged();
 }