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"
@@ skipping 187 matching lines @@
     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(std::wstring(), menu_model,
+                                              browser_view_->browser()));
     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)));
     }
   }
 }