Auto refresh avatar bubble after adding a secondary account

chrome/browser/ui/views/profile_chooser_view.cc

Index: chrome/browser/ui/views/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc
index fd0ea67dfc43d0f1a482c9acd1733a7aa8a34d20..3e769b38a3fe354175a45d795039f6bc0529512c 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -234,9 +234,15 @@ ProfileChooserView::ProfileChooserView(views::View* anchor_view,
       this,
       browser_));
   avatar_menu_->RebuildMenu();
+
+  Profile* profile = browser_->profile();
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->AddObserver(this);
 }
 
 ProfileChooserView::~ProfileChooserView() {
+  Profile* profile = browser_->profile();
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
+      RemoveObserver(this);
 }
 
 void ProfileChooserView::ResetLinksAndButtons() {
@@ -250,6 +256,7 @@ void ProfileChooserView::ResetLinksAndButtons() {
   add_user_button_ = NULL;
   add_account_button_ = NULL;
   open_other_profile_indexes_map_.clear();
+  view_mode_ = PROFILE_CHOOSER_VIEW;

[sky, 2013/11/04 21:19:33]

Is there a reason this is here not the member initializer list?

[guohui, 2013/11/05 14:40:01]

Because this is the current central place to initialize and reset all instance
members with default values. The method is called from constructor.

[sky, 2013/11/05 15:53:50]

For view_mode_ don't you only want it reset to the default from the constructor?
The one other place that invokes ResetLinksAndButtons() immediately resets
view_mode_.

[guohui, 2013/11/05 20:00:50]

it is the same as all other members, first reset to default, and then assigned
to a proper value based on the selected view. But i really don't have strong
preference on this, so i moved it to initializer in a new patch.

 }
 
 void ProfileChooserView::Init() {
@@ -264,6 +271,24 @@ void ProfileChooserView::OnAvatarMenuChanged(
   ShowView(PROFILE_CHOOSER_VIEW, avatar_menu);
 }
 
+void ProfileChooserView::OnRefreshTokenAvailable(
+    const std::string& account_id) {
+  // Refresh the account management view when a new account is added to the
+  // profile.
+  if (view_mode_ == ACCOUNT_MANAGEMENT_VIEW ||
+      view_mode_ == GAIA_SIGNIN_VIEW ||
+      view_mode_ == GAIA_ADD_ACCOUNT_VIEW) {
+    ShowView(ACCOUNT_MANAGEMENT_VIEW, avatar_menu_.get());
+  }
+}
+
+void ProfileChooserView::OnRefreshTokenRevoked(const std::string& account_id) {
+  // Refresh the account management view when an account is removed from the
+  // profile.
+  if (view_mode_ == ACCOUNT_MANAGEMENT_VIEW)
+    ShowView(ACCOUNT_MANAGEMENT_VIEW, avatar_menu_.get());
+}
+
 void ProfileChooserView::ShowView(BubbleViewMode view_to_display,
                                   AvatarMenu* avatar_menu) {
   // The account management view should only be displayed if the active profile
@@ -276,6 +301,7 @@ void ProfileChooserView::ShowView(BubbleViewMode view_to_display,
 
   ResetLinksAndButtons();
   RemoveAllChildViews(true);
+  view_mode_ = view_to_display;
 
   views::GridLayout* layout = CreateSingleColumnLayout(this);
   layout->set_minimum_size(gfx::Size(kMinMenuWidth, 0));