Rename for some supervised users ambiguity. Adding child account icon to the avatar menu bubble.

chrome/browser/profiles/avatar_menu.cc

 // 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.
 
 #include "chrome/browser/profiles/avatar_menu.h"
 
 #include "ash/ash_switches.h"
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
@@ skipping 207 matching lines @@
     } else {
       return l10n_util::GetStringFUTF16(IDS_CHILD_INFO_TWO_CUSTODIANS,
                                         custodian, second_custodian);
     }
 #endif
   }
   return base::string16();
 }
 
 const gfx::Image& AvatarMenu::GetSupervisedUserIcon() const {
+  if (browser_ && browser_->profile()->IsChild()) {
+    return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+        IDR_CHILD_USER_ICON);
+  }
   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_SUPERVISED_USER_ICON);
+      IDR_LEGACY_SUPERVISED_USER_ICON);
 }
 
 void AvatarMenu::ActiveBrowserChanged(Browser* browser) {
   browser_ = browser;
   menu_actions_->ActiveBrowserChanged(browser);
 
   // If browser is not NULL, get the path of its active profile.
   base::FilePath path;
   if (browser)
     path = browser->profile()->GetPath();
@@ skipping 17 matching lines @@
     observer_->OnAvatarMenuChanged(this);
 }
 
 #if defined(ENABLE_SUPERVISED_USERS)
 void AvatarMenu::OnCustodianInfoChanged() {
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }
 #endif