Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 207 matching lines @@
 
     for (std::vector<ContentSettingBubbleModel::PopupItem>::const_iterator
          i(bubble_content.popup_items.begin());
          i != bubble_content.popup_items.end(); ++i) {
       if (!bubble_content_empty)
         layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, kPopupColumnSetId);
 
       views::Link* link = new views::Link(base::UTF8ToUTF16(i->title));
       link->set_listener(this);
-      link->SetElideBehavior(views::Label::ELIDE_IN_MIDDLE);
+      link->SetElideBehavior(gfx::ELIDE_MIDDLE);
       popup_links_[link] = i - bubble_content.popup_items.begin();
       layout->AddView(new Favicon(i->image, this, link));
       layout->AddView(link);
       bubble_content_empty = false;
     }
   }
 
   const int indented_kSingleColumnSetId = 3;
   // Insert a column set with greater indent.
   views::ColumnSet* indented_single_column_set =
@@ skipping 233 matching lines @@
   int width = button->GetPreferredSize().width();
   for (int i = 0; i < menu_model->GetItemCount(); ++i) {
     button->SetText(menu_model->GetLabelAt(i));
     width = std::max(width, button->GetPreferredSize().width());
   }
 
   // Recover the title for the menu button.
   button->SetText(title);
   return width;
 }