Move AvatarMenuModel::Item into ui/base.

chrome/browser/ui/views/profile_chooser_view.cc

 // Copyright 2013 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/profile_chooser_view.h"
 
 #include <vector>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/profile_selector/avatar_menu_item_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 114 matching lines @@
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                      views::GridLayout::USE_PREF, 0, 0);
 
   // Seprate items into active and alternatives.
   Indexes other_profiles;
   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);
     if (item.active) {
       DCHECK(!current_profile_view_);
       current_profile_view_ = CreateCurrentProfileView(i);
     } else {
       other_profiles.push_back(i);
     }
   }
   DCHECK(current_profile_view_);
 
   layout->StartRow(1, 0);
@@ skipping 33 matching lines @@
   // TODO(bcwhite): image alterations
   view->SetImage(image.ToImageSkia());
 
   return view;
 }
 
 views::View* ProfileChooserView::CreateProfileCardView(size_t avatar_to_show) {
   views::View* view = new views::View();
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  const AvatarMenuModel::Item& avatar_item =
+  const ui::AvatarMenuItemModel& avatar_item =
       avatar_menu_model_->GetItemAt(avatar_to_show);
 
   const int kLargeImageSide = 64;
   views::View* photo_image =
       CreateProfileImageView(avatar_item.icon, kLargeImageSide);
   view->SetBoundsRect(photo_image->bounds());
 
   views::Label* name_label =
       new views::Label(avatar_item.name,
                        rb.GetFont(ui::ResourceBundle::MediumFont));
@@ skipping 114 matching lines @@
   layout->AddView(users_button_view_, 1, 1,
                   views::GridLayout::FILL, views::GridLayout::FILL,
                   0, kButtonHeight);
   layout->AddView(new views::Separator(views::Separator::VERTICAL));
   layout->AddView(guest_button_view_, 1, 1,
                   views::GridLayout::FILL, views::GridLayout::FILL,
                   0, kButtonHeight);
 
   return view;
 }