Add GetMinimumSize() for Labels and ensure it's zero for empty Links.

chrome/browser/ui/views/avatar_menu_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/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
@@ skipping 272 matching lines @@
   sync_state_label_->SetFont(rb->GetFont(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);
   edit_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  edit_link_->SetHasFocusBorder(true);
   AddChildView(edit_link_);
 
   OnHighlightStateChanged();
 }
 
 gfx::Size ProfileItemView::GetPreferredSize() {
   int text_width = std::max(name_label_->GetPreferredSize().width(),
                             sync_state_label_->GetPreferredSize().width());
   text_width = std::max(edit_link_->GetPreferredSize().width(), text_width);
   text_width = std::min(kMaxItemTextWidth, text_width);
@@ skipping 501 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }