Move AvatarMenuModel::Item into ui/base.

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 198 matching lines @@
 }
 
 }  // namespace
 
 // ProfileItemView ------------------------------------------------------------
 
 // Control that shows information about a single profile.
 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;
   virtual void Layout() OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
 
   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:
   gfx::ImageSkia GetBadgedIcon(const gfx::ImageSkia& icon);
 
   bool IsHighlighted();
 
-  AvatarMenuModel::Item item_;
+  ui::AvatarMenuItemModel item_;
   AvatarMenuBubbleView* parent_;
   views::ImageView* image_view_;
   views::Label* name_label_;
   views::Label* sync_state_label_;
   EditProfileLink* edit_link_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileItemView);
 };
 
-ProfileItemView::ProfileItemView(const AvatarMenuModel::Item& item,
+ProfileItemView::ProfileItemView(const ui::AvatarMenuItemModel& item,
                                  AvatarMenuBubbleView* parent)
     : views::CustomButton(parent),
       item_(item),
       parent_(parent) {
   set_notify_enter_exit_on_child(true);
 
   image_view_ = new ProfileImageView();
   gfx::ImageSkia profile_icon = *item_.icon.ToImageSkia();
   if (item_.active || item_.signin_required)
     image_view_->SetImage(GetBadgedIcon(profile_icon));
@@ skipping 439 matching lines @@
 }
 
 void AvatarMenuBubbleView::WindowClosing() {
   DCHECK_EQ(avatar_bubble_, this);
   avatar_bubble_ = NULL;
 }
 
 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));
     item_view->set_focusable(true);
     AddChildView(item_view);
     item_views_.push_back(item_view);
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kNewProfileManagement)) {
@@ skipping 11 matching lines @@
     AddChildView(separator_);
     buttons_view_ = add_profile_link;
     AddChildView(buttons_view_);
   }
 }
 
 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(
       IDS_PROFILES_SWITCH_TO_PROFILE_ACCESSIBLE_NAME, item.name));
   item_views_.push_back(item_view);
   AddChildView(item_view);
   separator_ = new views::Separator(views::Separator::HORIZONTAL);
   AddChildView(separator_);
 
   // Add information about managed users.
@@ skipping 40 matching lines @@
   Layout();
   if (GetBubbleFrameView())
     SizeToContents();
 }
 
 void AvatarMenuBubbleView::SetBackgroundColors() {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     item_views_[i]->OnHighlightStateChanged();
   }
 }