Index: chrome/browser/ui/views/avatar_menu_bubble_view.cc |
diff --git a/chrome/browser/ui/views/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/avatar_menu_bubble_view.cc |
index 3089862c60cab91be4a8823a7c34785520927ad5..db45338b62b65cb55713fb92e863d844a68d0ebd 100644 |
--- a/chrome/browser/ui/views/avatar_menu_bubble_view.cc |
+++ b/chrome/browser/ui/views/avatar_menu_bubble_view.cc |
@@ -216,7 +216,7 @@ bool ProfileImageView::HitTestRect(const gfx::Rect& rect) const { |
class ProfileItemView : public views::CustomButton, |
public HighlightDelegate { |
public: |
- ProfileItemView(const AvatarMenuModel::Item& item, |
+ ProfileItemView(const ui::AvatarMenuItemModel& item, |
AvatarMenuBubbleView* parent); |
virtual gfx::Size GetPreferredSize() OVERRIDE; |
@@ -229,7 +229,7 @@ class ProfileItemView : public views::CustomButton, |
virtual void OnHighlightStateChanged() OVERRIDE; |
virtual void OnFocusStateChanged(bool has_focus) OVERRIDE; |
- const AvatarMenuModel::Item& item() const { return item_; } |
+ const ui::AvatarMenuItemModel& item() const { return item_; } |
EditProfileLink* edit_link() { return edit_link_; } |
private: |
@@ -237,7 +237,7 @@ class ProfileItemView : public views::CustomButton, |
bool IsHighlighted(); |
- AvatarMenuModel::Item item_; |
+ ui::AvatarMenuItemModel item_; |
AvatarMenuBubbleView* parent_; |
views::ImageView* image_view_; |
views::Label* name_label_; |
@@ -247,7 +247,7 @@ class ProfileItemView : public views::CustomButton, |
DISALLOW_COPY_AND_ASSIGN(ProfileItemView); |
}; |
-ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item, |
+ProfileItemView::ProfileItemView(const ui::AvatarMenuItemModel& item, |
AvatarMenuBubbleView* parent) |
: views::CustomButton(parent), |
item_(item), |
@@ -707,7 +707,7 @@ void AvatarMenuBubbleView::WindowClosing() { |
void AvatarMenuBubbleView::InitMenuContents( |
AvatarMenuModel* avatar_menu_model) { |
for (size_t i = 0; i < avatar_menu_model->GetNumberOfItems(); ++i) { |
- const AvatarMenuModel::Item& item = avatar_menu_model->GetItemAt(i); |
+ const ui::AvatarMenuItemModel& item = avatar_menu_model->GetItemAt(i); |
ProfileItemView* item_view = new ProfileItemView(item, this); |
item_view->SetAccessibleName(l10n_util::GetStringFUTF16( |
IDS_PROFILES_SWITCH_TO_PROFILE_ACCESSIBLE_NAME, item.name)); |
@@ -739,7 +739,7 @@ void AvatarMenuBubbleView::InitManagedUserContents( |
AvatarMenuModel* avatar_menu_model) { |
// Show the profile of the managed user. |
size_t active_index = avatar_menu_model->GetActiveProfileIndex(); |
- const AvatarMenuModel::Item& item = |
+ const ui::AvatarMenuItemModel& item = |
avatar_menu_model->GetItemAt(active_index); |
ProfileItemView* item_view = new ProfileItemView(item, this); |
item_view->SetAccessibleName(l10n_util::GetStringFUTF16( |