Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/views/extensions/media_gallery_checkbox_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/extensions/media_gallery_checkbox_view.h"
 
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 29 matching lines @@
   SetBorder(views::Border::CreateEmptyBorder(
       0, views::kPanelHorizMargin, trailing_vertical_space,
       views::kPanelHorizMargin));
   if (menu_controller)
     set_context_menu_controller(menu_controller);
 
   checkbox_ = new views::Checkbox(label);
   checkbox_->set_listener(button_listener);
   if (menu_controller)
     checkbox_->set_context_menu_controller(menu_controller);
-  checkbox_->SetElideBehavior(views::Label::ELIDE_IN_MIDDLE);
+  checkbox_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   checkbox_->SetTooltipText(tooltip_text);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   folder_viewer_button_ = new views::ImageButton(button_listener);
   if (menu_controller)
     folder_viewer_button_->set_context_menu_controller(menu_controller);
   folder_viewer_button_->SetImage(views::ImageButton::STATE_NORMAL,
                                   rb.GetImageSkiaNamed(IDR_FILE_FOLDER));
   folder_viewer_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                            views::ImageButton::ALIGN_MIDDLE);
   folder_viewer_button_->SetAccessibleName(l10n_util::GetStringUTF16(
       IDS_MEDIA_GALLERIES_SCAN_RESULT_OPEN_FOLDER_VIEW_ACCESSIBILITY_NAME));
   folder_viewer_button_->SetFocusable(true);
   folder_viewer_button_->SetVisible(show_folder_button);
   folder_viewer_button_->SetBorder(views::Border::CreateEmptyBorder(
       0, views::kRelatedControlSmallHorizontalSpacing, 0, 0));
 
   secondary_text_ = new views::Label(details);
   if (menu_controller)
     secondary_text_->set_context_menu_controller(menu_controller);
   secondary_text_->SetVisible(details.length() > 0);
   secondary_text_->SetEnabledColor(kDeemphasizedTextColor);
-  secondary_text_->SetElideBehavior(views::Label::ELIDE_AT_BEGINNING);
+  secondary_text_->SetElideBehavior(gfx::ELIDE_HEAD);
   secondary_text_->SetTooltipText(tooltip_text);
   secondary_text_->SetBorder(views::Border::CreateEmptyBorder(
       0, views::kRelatedControlSmallHorizontalSpacing, 0, 0));
 
   AddChildView(checkbox_);
   AddChildView(folder_viewer_button_);
   AddChildView(secondary_text_);
 }
 
 MediaGalleryCheckboxView::~MediaGalleryCheckboxView() {}
@@ skipping 28 matching lines @@
   if (folder_viewer_button_->visible()) {
     folder_viewer_button_->SetBounds(checkbox_->x() + checkbox_width, area.y(),
                                      folder_viewer_width, area.height());
   }
   if (secondary_text_->visible()) {
     secondary_text_->SetBounds(
         checkbox_->x() + checkbox_width + folder_viewer_width,
         area.y(), secondary_text_width, area.height());
   }
 }