Child accounts icons added to Chrome OS notifications.

ash/system/chromeos/supervised/tray_supervised_user.cc

 // Copyright 2014 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 "ash/system/chromeos/supervised/tray_supervised_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/label_tray_view.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 42 matching lines @@
     CreateOrUpdateNotification(message);
 }
 
 views::View* TraySupervisedUser::CreateDefaultView(
     user::LoginStatus status) {
   CHECK(tray_view_ == NULL);
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   if (!delegate->IsUserSupervised())
     return NULL;
 
-  tray_view_ = new LabelTrayView(this, IDR_AURA_UBER_TRAY_SUPERVISED_USER);
+  tray_view_ = new LabelTrayView(this, GetSupervisedUserIconId());
   UpdateMessage();
   return tray_view_;
 }
 
 void TraySupervisedUser::DestroyDefaultView() {
   tray_view_ = NULL;
 }
 
 void TraySupervisedUser::OnViewClicked(views::View* sender) {
   Shell::GetInstance()->system_tray_delegate()->ShowSupervisedUserInfo();
@@ skipping 15 matching lines @@
 
   status_ = status;
   is_user_supervised_ = is_user_supervised;
 }
 
 void TraySupervisedUser::CreateOrUpdateNotification(
     const base::string16& new_message) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   scoped_ptr<Notification> notification(
       message_center::Notification::CreateSystemNotification(
-          kNotificationId,
-          base::string16() /* no title */,
-          new_message,
-          bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SUPERVISED_USER),
+          kNotificationId, base::string16() /* no title */, new_message,
+          bundle.GetImageNamed(GetSupervisedUserIconId()),
           system_notifier::kNotifierSupervisedUser,
           base::Closure() /* null callback */));
   message_center::MessageCenter::Get()->AddNotification(notification.Pass());
 }
 
 void TraySupervisedUser::CreateOrUpdateSupervisedWarningNotification() {
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   CreateOrUpdateNotification(delegate->GetSupervisedUserMessage());
 }
 
 void TraySupervisedUser::OnCustodianInfoChanged() {
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   std::string manager_name = delegate->GetSupervisedUserManager();
   if (!manager_name.empty()) {
     if (!delegate->IsUserChild() &&
         !message_center::MessageCenter::Get()->FindVisibleNotificationById(
             kNotificationId)) {
       CreateOrUpdateSupervisedWarningNotification();
     }
     UpdateMessage();
   }
 }
 
+int TraySupervisedUser::GetSupervisedUserIconId() {

[oshima, 2015/01/27 10:36:47]

can this be const?

[merkulova, 2015/01/27 16:39:47]

Done.

+  SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
+
+  if (delegate->IsUserChild())
+    return IDR_AURA_UBER_TRAY_CHILD_USER;
+  else if (delegate->IsUserSupervised())
+    return IDR_AURA_UBER_TRAY_SUPERVISED_USER;
+  return -1;
+}
+
 }  // namespace ash