Revert 96306 - Multi-Profiles: Change avatar menu to bubble view

chrome/browser/profiles/avatar_menu_model.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/profiles/avatar_menu_model.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 52 matching lines @@
 }
 
 AvatarMenuModel::Item::Item(size_t model_index, const gfx::Image& icon)
     : icon(icon),
       model_index(model_index) {
 }
 
 AvatarMenuModel::Item::~Item() {
 }
 
-void AvatarMenuModel::SwitchToProfile(size_t index) {
+void AvatarMenuModel::SwichToProfile(size_t index) {
   const Item& item = GetItemAt(index);
   FilePath path = profile_info_->GetPathOfProfileAtIndex(item.model_index);
 
   // This will be deleted by the manager after the profile is ready.
   ProfileSwitchObserver* observer = new ProfileSwitchObserver();
   g_browser_process->profile_manager()->CreateProfileAsync(
       path, observer);
 }
 
 void AvatarMenuModel::EditProfile(size_t index) {
@@ skipping 28 matching lines @@
   for (size_t i = 0; i < count; ++i) {
     Item* item = new Item(i, profile_info_->GetAvatarIconOfProfileAtIndex(i));
     item->name = profile_info_->GetNameOfProfileAtIndex(i);
     if (browser_) {
       FilePath path = profile_info_->GetPathOfProfileAtIndex(i);
       item->active = browser_->profile()->GetPath() == path;
     }
     items_.push_back(item);
   }
 
-  observer_->OnAvatarMenuModelChanged(this);
+  observer_->OnAvatarMenuModelChanged();
 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
 }