Update the AvatarMenu when a supervised user's custodian info changes.

chrome/browser/profiles/avatar_menu.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/image/image.h"
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "base/scoped_observer.h"

[Bernhard Bauer, 2014/09/25 16:11:19]

For sake of simplicity, I would include this unconditionally.

[Marc Treib, 2014/09/25 16:17:17]

Done.

+#include "chrome/browser/supervised_user/supervised_user_service_observer.h"
+#endif
+
+class AvatarMenuActions;
 class AvatarMenuObserver;
 class Browser;
 class Profile;
 class ProfileInfoInterface;
 class ProfileList;
-class AvatarMenuActions;
+
+#if defined(ENABLE_MANAGED_USERS)
+class SupervisedUserService;

[Bernhard Bauer, 2014/09/25 16:11:19]

Same here, forward-declare this unconditionally. It doesn't add to compile time,
and trying to use it will fail because the header isn't included (and can't be).

[Marc Treib, 2014/09/25 16:17:16]

Done.

+#endif
 
 // This class represents the menu-like interface used to select profiles,
 // such as the bubble that appears when the avatar icon is clicked in the
 // browser window frame. This class will notify its observer when the backend
 // data changes, and the view for this model should forward actions
 // back to it in response to user events.
-class AvatarMenu : public content::NotificationObserver {
+class AvatarMenu :
+#if defined(ENABLE_MANAGED_USERS)
+    public SupervisedUserServiceObserver,
+#endif
+    public content::NotificationObserver {
  public:
   // Represents an item in the menu.
   struct Item {
     Item(size_t menu_index, size_t profile_index, const gfx::Image& icon);
     ~Item();
 
     // The icon to be displayed next to the item.
     gfx::Image icon;
 
     // Whether or not the current browser is using this profile.
@@ skipping 90 matching lines @@
 
   // Returns true if the edit profile link should be shown.
   bool ShouldShowEditProfileLink() const;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
+#if defined(ENABLE_MANAGED_USERS)
+  // SupervisedUserServiceObserver:
+  virtual void OnCustodianInfoChanged() OVERRIDE;
+#endif
+
   // The model that provides the list of menu items.
   scoped_ptr<ProfileList> profile_list_;
 
   // The controller for avatar menu actions.
   scoped_ptr<AvatarMenuActions> menu_actions_;
 
+#if defined(ENABLE_MANAGED_USERS)
+  // Observes changes to a supervised user's custodian info.
+  ScopedObserver<SupervisedUserService, SupervisedUserServiceObserver>
+    supervised_user_observer_;

[Bernhard Bauer, 2014/09/25 16:11:19]

Indent two more spaces.

[Marc Treib, 2014/09/25 16:17:17]

Done.

+#endif
+
   // The cache that provides the profile information. Weak.
   ProfileInfoInterface* profile_info_;
 
   // The observer of this model, which is notified of changes. Weak.
   AvatarMenuObserver* observer_;
 
   // Browser in which this avatar menu resides. Weak.
   Browser* browser_;
 
   // Listens for notifications from the ProfileInfoCache.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_