Auto refresh avatar bubble after adding a secondary account

chrome/browser/ui/views/profile_chooser_view.cc

 // Copyright 2013 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/profile_chooser_view.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_util.h"
@@ skipping 216 matching lines @@
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(kArrowHeight, 0, kArrowHeight, 0));
 
   ResetLinksAndButtons();
 
   avatar_menu_.reset(new AvatarMenu(
       &g_browser_process->profile_manager()->GetProfileInfoCache(),
       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() {
   manage_accounts_link_ = NULL;
   signout_current_profile_link_ = NULL;
   signin_current_profile_link_ = NULL;
   change_photo_link_ = NULL;
   guest_button_ = NULL;
   end_guest_button_ = NULL;
   users_button_ = NULL;
   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() {
   ShowView(PROFILE_CHOOSER_VIEW, avatar_menu_.get());
 }
 
 void ProfileChooserView::OnAvatarMenuChanged(
     AvatarMenu* avatar_menu) {
   // Refresh the view with the new menu. We can't just update the local copy
   // as this may have been triggered by a sign out action, in which case
   // the view is being destroyed.
   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
   // is signed in.
   if (view_to_display == ACCOUNT_MANAGEMENT_VIEW) {
     const AvatarMenu::Item& active_item = avatar_menu->GetItemAt(
         avatar_menu->GetActiveProfileIndex());
     DCHECK(active_item.signed_in);
   }
 
   ResetLinksAndButtons();
   RemoveAllChildViews(true);
+  view_mode_ = view_to_display;
 
   views::GridLayout* layout = CreateSingleColumnLayout(this);
   layout->set_minimum_size(gfx::Size(kMinMenuWidth, 0));
 
   if (view_to_display == GAIA_SIGNIN_VIEW ||
       view_to_display == GAIA_ADD_ACCOUNT_VIEW) {
     // Minimum size for embedded sign in pages as defined in Gaia.
     const int kMinGaiaViewWidth = 320;
     const int kMinGaiaViewHeight = 500;
     Profile* profile = browser_->profile();
@@ skipping 335 matching lines @@
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   add_account_button_ = new views::BlueButton(
       this,
       l10n_util::GetStringFUTF16(IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON,
                                  avatar_item.name));
   layout->StartRow(1, 0);
   layout->AddView(add_account_button_);
   return view;
 }