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

BUG=
TEST=Ran on views and verified that things looked ok.

Review URL: http://codereview.chromium.org/7566050

TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/7622001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96309 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/profiles/avatar_menu_model.cc b/chrome/browser/profiles/avatar_menu_model.cc
index 408728d..512c1ce 100644
--- a/chrome/browser/profiles/avatar_menu_model.cc
+++ b/chrome/browser/profiles/avatar_menu_model.cc
@@ -70,7 +70,7 @@ AvatarMenuModel::Item::Item(size_t model_index, const gfx::Image& icon)
 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);
 
@@ -119,7 +119,7 @@ void AvatarMenuModel::RebuildMenu() {
     items_.push_back(item);
   }
 
-  observer_->OnAvatarMenuModelChanged(this);
+  observer_->OnAvatarMenuModelChanged();
 }
 
 void AvatarMenuModel::ClearMenu() {
diff --git a/chrome/browser/profiles/avatar_menu_model.h b/chrome/browser/profiles/avatar_menu_model.h
index b371f2b..7de6379 100644
--- a/chrome/browser/profiles/avatar_menu_model.h
+++ b/chrome/browser/profiles/avatar_menu_model.h
@@ -59,7 +59,7 @@ class AvatarMenuModel : public NotificationObserver {
   // model:
   // Opens a Browser with the specified profile in response to the user
   // selecting an item.
-  void SwitchToProfile(size_t index);
+  void SwichToProfile(size_t index);
   // Opens the profile settings in response to clicking the edit button next to
   // an item.
   void EditProfile(size_t index);
diff --git a/chrome/browser/profiles/avatar_menu_model_observer.h b/chrome/browser/profiles/avatar_menu_model_observer.h
index e6586c3..0643622 100644
--- a/chrome/browser/profiles/avatar_menu_model_observer.h
+++ b/chrome/browser/profiles/avatar_menu_model_observer.h
@@ -5,15 +5,13 @@
 #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_MODEL_OBSERVER_H_
 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_MODEL_OBSERVER_H_
 
-class AvatarMenuModel;
-
 // Delegate interface for objects that want to be notified when the
 // AvatarMenuModel changes.
 class AvatarMenuModelObserver {
  public:
   virtual ~AvatarMenuModelObserver() {}
 
-  virtual void OnAvatarMenuModelChanged(AvatarMenuModel* avatar_menu_model) = 0;
+  virtual void OnAvatarMenuModelChanged() = 0;
 };
 
 #endif  // CHROME_BROWSER_PROFILES_AVATAR_MENU_MODEL_OBSERVER_H_