Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/views/profiles/avatar_menu_bubble_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/profiles/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 264 matching lines @@
   name_label_ = new views::Label(item_.name,
                                  rb->GetFontList(item_.active ?
                                                  ui::ResourceBundle::BoldFont :
                                                  ui::ResourceBundle::BaseFont));
   name_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(name_label_);
 
   // Add a label to show the sync state.
   sync_state_label_ = new views::Label(item_.sync_state);
   if (item_.signed_in)
-    sync_state_label_->SetElideBehavior(views::Label::ELIDE_AS_EMAIL);
+    sync_state_label_->SetElideBehavior(gfx::ELIDE_EMAIL);
   sync_state_label_->SetFontList(
       rb->GetFontList(ui::ResourceBundle::SmallFont));
   sync_state_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   sync_state_label_->SetEnabled(false);
   AddChildView(sync_state_label_);
 
   // Add an edit profile link.
   edit_link_ = new EditProfileLink(
       l10n_util::GetStringUTF16(IDS_PROFILES_EDIT_PROFILE_LINK), this);
   edit_link_->set_listener(parent);
@@ skipping 509 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }