Multi-Profiles: Add icon chooser to profiles menu

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2011 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/frame/opaque_browser_frame_view.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/ui/profile_menu_model.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
@@ skipping 168 matching lines @@
 
   // Initializing the TabIconView is expensive, so only do it if we need to.
   if (browser_view_->ShouldShowWindowIcon()) {
     window_icon_ = new TabIconView(this);
     window_icon_->set_is_light(true);
     AddChildView(window_icon_);
     window_icon_->Update();
   }
 
   if (browser_view_->ShouldShowAvatar()) {
-    ui::MenuModel* menu_model = browser_view_->IsOffTheRecord() ?
-        NULL : new ProfileMenuModel(browser_view_->browser());
-    // AvatarMenuButton takes ownership of |menu_model|.
-    avatar_button_.reset(new AvatarMenuButton(std::wstring(), menu_model));
+    avatar_button_.reset(new AvatarMenuButton(
+        browser_view_->browser(), !browser_view_->IsOffTheRecord()));
     AddChildView(avatar_button_.get());
     UpdateAvatarInfo();
     if (!browser_view_->IsOffTheRecord()) {
       registrar_.Add(this, NotificationType::PROFILE_CACHED_INFO_CHANGED,
                      NotificationService::AllSources());
     }
   }
 }
 
 OpaqueBrowserFrameView::~OpaqueBrowserFrameView() {
@@ skipping 943 matching lines @@
         g_browser_process->profile_manager()->GetProfileInfoCache();
     Profile* profile = browser_view_->browser()->profile();
     size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (index != std::string::npos) {
       avatar_button_->SetIcon(cache.GetAvatarIconOfProfileAtIndex(index));
       avatar_button_->SetText(UTF16ToWideHack(
           cache.GetNameOfProfileAtIndex(index)));
     }
   }
 }