Add gaia_id to ProfileInfoCache.

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 212 matching lines @@
  private:
   gfx::ImageSkia GetBadgedIcon(const gfx::ImageSkia& icon);
 
   bool IsHighlighted();
 
   AvatarMenu::Item item_;
   AvatarMenuBubbleView* parent_;
   AvatarMenu* menu_;
   views::ImageView* image_view_;
   views::Label* name_label_;
-  views::Label* sync_state_label_;
+  views::Label* username_label_;
   EditProfileLink* edit_link_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileItemView);
 };
 
 ProfileItemView::ProfileItemView(const AvatarMenu::Item& item,
                                  AvatarMenuBubbleView* parent,
                                  AvatarMenu* menu)
     : views::CustomButton(parent),
       item_(item),
@@ skipping 17 matching lines @@
 
   // Add a label to show the profile name.
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   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);
+  // Add a label to show the username.
+  username_label_ = new views::Label(item_.username);
   if (item_.signed_in)
-    sync_state_label_->SetElideBehavior(gfx::ELIDE_EMAIL);
-  sync_state_label_->SetFontList(
+    username_label_->SetElideBehavior(gfx::ELIDE_EMAIL);
+  username_label_->SetFontList(
       rb->GetFontList(ui::ResourceBundle::SmallFont));
-  sync_state_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  sync_state_label_->SetEnabled(false);
-  AddChildView(sync_state_label_);
+  username_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  username_label_->SetEnabled(false);
+  AddChildView(username_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);
   AddChildView(edit_link_);
 
   OnHighlightStateChanged();
 }
 
 gfx::Size ProfileItemView::GetPreferredSize() const {
   int text_width = std::max(name_label_->GetPreferredSize().width(),
-                            sync_state_label_->GetPreferredSize().width());
+                            username_label_->GetPreferredSize().width());
   text_width = std::max(edit_link_->GetPreferredSize().width(), text_width);
   text_width = std::min(kMaxItemTextWidth, text_width);
   return gfx::Size(profiles::kAvatarIconWidth + kIconMarginX + text_width,
                    kItemHeight);
 }
 
 void ProfileItemView::Layout() {
   // Profile icon.
   gfx::Rect icon_rect;
   if (item_.active) {
     // If this is the active item then the icon is already scaled and so
     // just use the preferred size.
     icon_rect.set_size(image_view_->GetPreferredSize());
     icon_rect.set_y((height() - icon_rect.height()) / 2);
   } else {
     const gfx::ImageSkia& icon = image_view_->GetImage();
     icon_rect = GetCenteredAndScaledRect(icon.width(), icon.height(), 0, 0,
         profiles::kAvatarIconWidth, height());
   }
   image_view_->SetBoundsRect(icon_rect);
 
   int label_x = profiles::kAvatarIconWidth + kIconMarginX;
   int max_label_width = std::max(width() - label_x, 0);
   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();
+  gfx::Size state_size = username_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());
   int y = (height() - labels_height) / 2;
   name_label_->SetBounds(label_x, y, name_size.width(), name_size.height());
 
   int bottom = y + labels_height;
-  sync_state_label_->SetBounds(label_x, bottom - state_size.height(),
+  username_label_->SetBounds(label_x, bottom - state_size.height(),
                                state_size.width(), state_size.height());
   // The edit link overlaps the sync state label.
   edit_link_->SetBounds(label_x, bottom - edit_size.height(),
                         edit_size.width(), edit_size.height());
 }
 
 void ProfileItemView::OnMouseEntered(const ui::MouseEvent& event) {
   views::CustomButton::OnMouseEntered(event);
   OnHighlightStateChanged();
 }
@@ skipping 10 matching lines @@
 
 void ProfileItemView::OnBlur() {
   views::CustomButton::OnBlur();
   OnFocusStateChanged(false);
 }
 
 void ProfileItemView::OnHighlightStateChanged() {
   const SkColor color = IsHighlighted() ? kHighlightColor : parent_->color();
   set_background(views::Background::CreateSolidBackground(color));
   name_label_->SetBackgroundColor(color);
-  sync_state_label_->SetBackgroundColor(color);
+  username_label_->SetBackgroundColor(color);
   edit_link_->SetBackgroundColor(color);
 
   bool show_edit = IsHighlighted() && item_.active &&
       menu_->ShouldShowEditProfileLink();
-  sync_state_label_->SetVisible(!show_edit);
+  username_label_->SetVisible(!show_edit);
   edit_link_->SetVisible(show_edit);
   SchedulePaint();
 }
 
 void ProfileItemView::OnFocusStateChanged(bool has_focus) {
   if (!has_focus && state() != views::CustomButton::STATE_DISABLED)
     SetState(views::CustomButton::STATE_NORMAL);
   OnHighlightStateChanged();
 }
 
@@ skipping 419 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }