diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 02:33:34 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 02:33:34 +0000 |
| commit | 465862a036acee434df5d8fa85a462c75f37b8c7 (patch) | |
| tree | 49899565b7499796155197e1a384ae16038627d8 /chrome/browser/profiles | |
| parent | 85043a91f7201b7de4af66d9f899347c1743f40a (diff) | |
| download | chromium_src-465862a036acee434df5d8fa85a462c75f37b8c7.zip chromium_src-465862a036acee434df5d8fa85a462c75f37b8c7.tar.gz chromium_src-465862a036acee434df5d8fa85a462c75f37b8c7.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/avatar_menu_model.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/profiles/avatar_menu_model.h | 2 | ||||
| -rw-r--r-- | chrome/browser/profiles/avatar_menu_model_observer.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/profiles/avatar_menu_model.cc b/chrome/browser/profiles/avatar_menu_model.cc index 512c1ce..408728d 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::SwichToProfile(size_t index) { +void AvatarMenuModel::SwitchToProfile(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(); + observer_->OnAvatarMenuModelChanged(this); } void AvatarMenuModel::ClearMenu() { diff --git a/chrome/browser/profiles/avatar_menu_model.h b/chrome/browser/profiles/avatar_menu_model.h index 7de6379..b371f2b 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 SwichToProfile(size_t index); + void SwitchToProfile(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 0643622..e6586c3 100644 --- a/chrome/browser/profiles/avatar_menu_model_observer.h +++ b/chrome/browser/profiles/avatar_menu_model_observer.h @@ -5,13 +5,15 @@ #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() = 0; + virtual void OnAvatarMenuModelChanged(AvatarMenuModel* avatar_menu_model) = 0; }; #endif // CHROME_BROWSER_PROFILES_AVATAR_MENU_MODEL_OBSERVER_H_ |