Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5744)

Unified Diff: chrome/browser/ui/views/profile_chooser_view.cc

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc
index 280853fe57e5f002da9a2abbc28ee7ebe47ee218..5e567577b66d97ab94d6236c0ad86487b0af095c 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/models/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"
@@ -141,7 +142,7 @@ void ProfileChooserView::OnAvatarMenuModelChanged(
// 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 AvatarMenuItemModel& item = avatar_menu_model->GetItemAt(i);
if (item.active) {
DCHECK(!current_profile_view_);
current_profile_view_ = CreateCurrentProfileView(i);
@@ -195,7 +196,7 @@ 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 AvatarMenuItemModel& avatar_item =
avatar_menu_model_->GetItemAt(avatar_to_show);
const int kLargeImageSide = 64;

Powered by Google App Engine
This is Rietveld 408576698