Revert 111018 - Rebase AvatarMenuBubbleView on the new views bubble.

chrome/browser/ui/views/avatar_menu_bubble_view.cc

 // Copyright (c) 2011 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/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 11 matching lines @@
 #include "ui/gfx/image/image.h"
 #include "views/controls/button/custom_button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/separator.h"
 
 namespace {
 
-// TODO(msw): Get color from theme/window color.
-const SkColor kColor = SK_ColorWHITE;
-
 const int kItemHeight = 44;
 const int kItemMarginY = 4;
 const int kIconWidth = 38;
 const int kIconMarginX = 6;
 const int kSeparatorPaddingY = 5;
 
 inline int Round(double x) {
   return static_cast<int>(x + 0.5);
 }
 
@@ skipping 185 matching lines @@
 }
 
 void ProfileItemView::Layout() {
   // Profile icon.
   const SkBitmap& icon = image_view_->GetImage();
   gfx::Rect icon_rect = GetCenteredAndScaledRect(
       icon.width(), icon.height(), 0, 0, kIconWidth, height());
   image_view_->SetBoundsRect(icon_rect);
 
   int label_x = icon_rect.right() + kIconMarginX;
-  int max_label_width = std::max(width() - label_x, 0);
+  int max_label_width = width() - label_x;
   gfx::Size name_size = name_label_->GetPreferredSize();
   name_size.set_width(std::min(name_size.width(), max_label_width));
   gfx::Size state_size = sync_state_label_->GetPreferredSize();
   state_size.set_width(std::min(state_size.width(), max_label_width));
   gfx::Size edit_size = edit_link_->GetPreferredSize();
   edit_size.set_width(std::min(edit_size.width(), max_label_width));
 
   const int kNameStatePaddingY = 2;
   int labels_height = name_size.height() + kNameStatePaddingY +
       std::max(state_size.height(), edit_size.height());
@@ skipping 24 matching lines @@
 }
 
 void ProfileItemView::OnBlur() {
   views::CustomButton::OnBlur();
   OnFocusStateChanged(false);
 }
 
 void ProfileItemView::OnHighlightStateChanged() {
   set_background(IsHighlighted() ? views::Background::CreateSolidBackground(
       SkColorSetRGB(0xe3, 0xed, 0xf6)) : NULL);
+  SkColor background_color = background() ?
+      background()->get_color() : Bubble::kBackgroundColor;
+  name_label_->SetBackgroundColor(background_color);
+  sync_state_label_->SetBackgroundColor(background_color);
+  edit_link_->SetBackgroundColor(background_color);
 
   bool show_edit = IsHighlighted() && item_.active;
   sync_state_label_->SetVisible(!show_edit);
   edit_link_->SetVisible(show_edit);
   SchedulePaint();
 }
 
 void ProfileItemView::OnFocusStateChanged(bool has_focus) {
   if (!has_focus && state() != views::CustomButton::BS_DISABLED)
     SetState(views::CustomButton::BS_NORMAL);
@@ skipping 26 matching lines @@
          edit_link_->state() == views::CustomButton::BS_HOT ||
          HasFocus() ||
          edit_link_->HasFocus();
 }
 
 }  // namespace
 
 
 // AvatarMenuBubbleView -------------------------------------------------------
 
-AvatarMenuBubbleView::AvatarMenuBubbleView(
-    views::View* anchor_view,
-    views::BubbleBorder::ArrowLocation arrow_location,
-    const gfx::Rect& anchor_rect,
-    Browser* browser)
-    : BubbleDelegateView(anchor_view, arrow_location, kColor),
-      anchor_rect_(anchor_rect),
-      add_profile_link_(NULL),
+AvatarMenuBubbleView::AvatarMenuBubbleView(Browser* browser)
+    : add_profile_link_(NULL),
       browser_(browser) {
   avatar_menu_model_.reset(new AvatarMenuModel(
       &g_browser_process->profile_manager()->GetProfileInfoCache(),
       this, browser_));
   // Build the menu for the first time.
   OnAvatarMenuModelChanged(avatar_menu_model_.get());
 }
 
 AvatarMenuBubbleView::~AvatarMenuBubbleView() {
 }
@@ skipping 92 matching lines @@
 
   for (size_t i = 0; i < item_views_.size(); ++i) {
     ProfileItemView* item_view = static_cast<ProfileItemView*>(item_views_[i]);
     if (source == item_view->edit_link()) {
       avatar_menu_model_->EditProfile(i);
       return;
     }
   }
 }
 
-gfx::Point AvatarMenuBubbleView::GetAnchorPoint() {
-  return gfx::Point(anchor_rect_.CenterPoint().x(), anchor_rect_.bottom());
+void AvatarMenuBubbleView::BubbleShown() {
+  GetFocusManager()->RegisterAccelerator(
+      ui::Accelerator(ui::VKEY_DOWN, false, false, false), this);
+  GetFocusManager()->RegisterAccelerator(
+      ui::Accelerator(ui::VKEY_UP, false, false, false), this);
 }
 
-void AvatarMenuBubbleView::Init() {
-  AddAccelerator(ui::Accelerator(ui::VKEY_DOWN, 0));
-  AddAccelerator(ui::Accelerator(ui::VKEY_UP, 0));
+void AvatarMenuBubbleView::BubbleClosing(Bubble* bubble,
+                                         bool closed_by_escape) {
+}
+
+bool AvatarMenuBubbleView::CloseOnEscape() {
+  return true;
+}
+
+bool AvatarMenuBubbleView::FadeInOnShow() {
+  return false;
 }
 
 void AvatarMenuBubbleView::OnAvatarMenuModelChanged(
     AvatarMenuModel* avatar_menu_model) {
   // Unset all our child view references and call RemoveAllChildViews() which
   // will actually delete them.
   add_profile_link_ = NULL;
   item_views_.clear();
   RemoveAllChildViews(true);
 
   for (size_t i = 0; i < avatar_menu_model->GetNumberOfItems(); ++i) {
     const AvatarMenuModel::Item& item = avatar_menu_model->GetItemAt(i);
     ProfileItemView* item_view = new ProfileItemView(item, this, this);
     item_view->SetAccessibleName(l10n_util::GetStringFUTF16(
         IDS_PROFILES_SWITCH_TO_PROFILE_ACCESSIBLE_NAME, item.name));
     item_view->set_focusable(true);
     AddChildView(item_view);
     item_views_.push_back(item_view);
   }
 
   separator_ = new views::Separator();
   AddChildView(separator_);
 
   add_profile_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK));
   add_profile_link_->set_listener(this);
   add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  add_profile_link_->SetBackgroundColor(Bubble::kBackgroundColor);
   add_profile_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));
   AddChildView(add_profile_link_);
 
   PreferredSizeChanged();
 }