| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/chromeos/supervised/tray_supervised_user.h" | 5 #include "ash/system/chromeos/supervised/tray_supervised_user.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/chromeos/label_tray_view.h" | 8 #include "ash/system/chromeos/label_tray_view.h" |
| 9 #include "ash/system/system_notifier.h" | 9 #include "ash/system/system_notifier.h" |
| 10 #include "ash/system/tray/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" |
| 11 #include "ash/system/tray/system_tray_notifier.h" | 11 #include "ash/system/tray/system_tray_notifier.h" |
| 12 #include "ash/system/tray/tray_notification_view.h" | 12 #include "ash/system/tray/tray_notification_view.h" |
| 13 #include "ash/system/user/login_status.h" | 13 #include "ash/system/user/login_status.h" |
| 14 #include "base/bind.h" |
| 14 #include "base/callback.h" | 15 #include "base/callback.h" |
| 15 #include "base/logging.h" | 16 #include "base/logging.h" |
| 16 #include "grit/ash_resources.h" | 17 #include "grit/ash_resources.h" |
| 17 #include "ui/base/resource/resource_bundle.h" | 18 #include "ui/base/resource/resource_bundle.h" |
| 18 #include "ui/message_center/message_center.h" | 19 #include "ui/message_center/message_center.h" |
| 19 #include "ui/message_center/notification.h" | 20 #include "ui/message_center/notification.h" |
| 20 #include "ui/message_center/notification_delegate.h" | 21 #include "ui/message_center/notification_delegate.h" |
| 21 | 22 |
| 22 using message_center::Notification; | 23 using message_center::Notification; |
| 23 | 24 |
| 24 namespace ash { | 25 namespace ash { |
| 25 | 26 |
| 26 const char TraySupervisedUser::kNotificationId[] = | 27 const char TraySupervisedUser::kNotificationId[] = |
| 27 "chrome://user/locally-managed"; | 28 "chrome://user/locally-managed"; |
| 28 | 29 |
| 29 TraySupervisedUser::TraySupervisedUser(SystemTray* system_tray) | 30 TraySupervisedUser::TraySupervisedUser(SystemTray* system_tray) |
| 30 : SystemTrayItem(system_tray), | 31 : SystemTrayItem(system_tray), |
| 31 tray_view_(NULL), | 32 tray_view_(NULL), |
| 32 status_(ash::user::LOGGED_IN_NONE), | 33 status_(ash::user::LOGGED_IN_NONE), |
| 33 is_user_supervised_(false) { | 34 is_user_supervised_(false), |
| 35 weak_factory_(this) { |
| 36 Shell::GetInstance()->system_tray_delegate()->AddCustodianInfoChangedCallback( |
| 37 base::Bind(&TraySupervisedUser::OnCustodianInfoChanged, |
| 38 weak_factory_.GetWeakPtr())); |
| 34 } | 39 } |
| 35 | 40 |
| 36 TraySupervisedUser::~TraySupervisedUser() { | 41 TraySupervisedUser::~TraySupervisedUser() { |
| 37 } | 42 } |
| 38 | 43 |
| 39 void TraySupervisedUser::UpdateMessage() { | 44 void TraySupervisedUser::UpdateMessage() { |
| 40 base::string16 message = Shell::GetInstance()->system_tray_delegate()-> | 45 base::string16 message = Shell::GetInstance()->system_tray_delegate()-> |
| 41 GetSupervisedUserMessage(); | 46 GetSupervisedUserMessage(); |
| 42 if (tray_view_) | 47 if (tray_view_) |
| 43 tray_view_->SetMessage(message); | 48 tray_view_->SetMessage(message); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 68 | 73 |
| 69 void TraySupervisedUser::UpdateAfterLoginStatusChange( | 74 void TraySupervisedUser::UpdateAfterLoginStatusChange( |
| 70 user::LoginStatus status) { | 75 user::LoginStatus status) { |
| 71 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); | 76 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); |
| 72 | 77 |
| 73 bool is_user_supervised = delegate->IsUserSupervised(); | 78 bool is_user_supervised = delegate->IsUserSupervised(); |
| 74 if (status == status_ && is_user_supervised == is_user_supervised_) | 79 if (status == status_ && is_user_supervised == is_user_supervised_) |
| 75 return; | 80 return; |
| 76 | 81 |
| 77 if (is_user_supervised && | 82 if (is_user_supervised && |
| 78 status_ != ash::user::LOGGED_IN_LOCKED) { | 83 status_ != ash::user::LOGGED_IN_LOCKED && |
| 79 CreateOrUpdateNotification(delegate->GetSupervisedUserMessage()); | 84 !delegate->GetSupervisedUserManager().empty()) |
| 80 } | 85 CreateOrUpdateSupervisedWarningNotification(); |
| 86 |
| 81 status_ = status; | 87 status_ = status; |
| 82 is_user_supervised_ = is_user_supervised; | 88 is_user_supervised_ = is_user_supervised; |
| 83 } | 89 } |
| 84 | 90 |
| 85 void TraySupervisedUser::CreateOrUpdateNotification( | 91 void TraySupervisedUser::CreateOrUpdateNotification( |
| 86 const base::string16& new_message) { | 92 const base::string16& new_message) { |
| 87 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); | 93 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
| 88 scoped_ptr<Notification> notification( | 94 scoped_ptr<Notification> notification( |
| 89 message_center::Notification::CreateSystemNotification( | 95 message_center::Notification::CreateSystemNotification( |
| 90 kNotificationId, | 96 kNotificationId, |
| 91 base::string16() /* no title */, | 97 base::string16() /* no title */, |
| 92 new_message, | 98 new_message, |
| 93 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SUPERVISED_USER), | 99 bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SUPERVISED_USER), |
| 94 system_notifier::kNotifierSupervisedUser, | 100 system_notifier::kNotifierSupervisedUser, |
| 95 base::Closure() /* null callback */)); | 101 base::Closure() /* null callback */)); |
| 96 message_center::MessageCenter::Get()->AddNotification(notification.Pass()); | 102 message_center::MessageCenter::Get()->AddNotification(notification.Pass()); |
| 97 } | 103 } |
| 98 | 104 |
| 105 void TraySupervisedUser::CreateOrUpdateSupervisedWarningNotification() { |
| 106 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); |
| 107 CreateOrUpdateNotification(delegate->GetSupervisedUserMessage()); |
| 108 } |
| 109 |
| 110 void TraySupervisedUser::OnCustodianInfoChanged() { |
| 111 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); |
| 112 std::string manager_name = delegate->GetSupervisedUserManager(); |
| 113 if (!manager_name.empty()) { |
| 114 if (!message_center::MessageCenter::Get()->FindVisibleNotificationById( |
| 115 kNotificationId)) |
| 116 CreateOrUpdateSupervisedWarningNotification(); |
| 117 UpdateMessage(); |
| 118 } |
| 119 } |
| 120 |
| 99 } // namespace ash | 121 } // namespace ash |
| OLD | NEW |