Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/views/location_bar/icon_label_bubble_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/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 46 matching lines @@
       bitmap.getColor(bitmap.width() / 2, bitmap.height() / 2);
   // Tricky bit: We alpha blend an opaque version of |background_image_color|
   // against |parent_background_color| using the original image grid color's
   // alpha. This is because AlphaBlend(a, b, 255) always returns |a| unchanged
   // even if |a| is a color with non-255 alpha.
   label_->SetBackgroundColor(
       color_utils::AlphaBlend(SkColorSetA(background_image_color, 255),
                               parent_background_color,
                               SkColorGetA(background_image_color)));
   if (elide_in_middle)
-    label_->SetElideBehavior(views::Label::ELIDE_IN_MIDDLE);
+    label_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   AddChildView(label_);
 }
 
 IconLabelBubbleView::~IconLabelBubbleView() {
 }
 
 void IconLabelBubbleView::SetLabel(const base::string16& label) {
   label_->SetText(label);
 }
 
@@ skipping 43 matching lines @@
   views::Painter* painter = (in_hover_ && hover_background_painter_) ?
       hover_background_painter_.get() : background_painter_.get();
   painter->Paint(canvas, size());
 }
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
   const int image_width = image_->GetPreferredSize().width();
   return GetBubbleOuterPadding(true) +
       (image_width ? (image_width + LocationBarView::kItemPadding) : 0);
 }