summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications/message_center_settings_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/notifications/message_center_settings_controller.cc')
-rw-r--r--chrome/browser/notifications/message_center_settings_controller.cc19
1 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc
index a163942..f0bc5fb 100644
--- a/chrome/browser/notifications/message_center_settings_controller.cc
+++ b/chrome/browser/notifications/message_center_settings_controller.cc
@@ -141,16 +141,16 @@ MessageCenterSettingsController::MessageCenterSettingsController(
#if defined(OS_CHROMEOS)
// UserManager may not exist in some tests.
- if (chromeos::UserManager::IsInitialized())
- chromeos::UserManager::Get()->AddSessionStateObserver(this);
+ if (user_manager::UserManager::IsInitialized())
+ user_manager::UserManager::Get()->AddSessionStateObserver(this);
#endif
}
MessageCenterSettingsController::~MessageCenterSettingsController() {
#if defined(OS_CHROMEOS)
// UserManager may not exist in some tests.
- if (chromeos::UserManager::IsInitialized())
- chromeos::UserManager::Get()->RemoveSessionStateObserver(this);
+ if (user_manager::UserManager::IsInitialized())
+ user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
#endif
}
@@ -446,7 +446,7 @@ void MessageCenterSettingsController::CreateNotifierGroupForGuestLogin() {
if (!notifier_groups_.empty())
return;
- chromeos::UserManager* user_manager = chromeos::UserManager::Get();
+ user_manager::UserManager* user_manager = user_manager::UserManager::Get();
// |notifier_groups_| can be empty in login screen too.
if (!user_manager->IsLoggedInAsGuest())
return;
@@ -488,8 +488,9 @@ void MessageCenterSettingsController::RebuildNotifierGroups() {
#if defined(OS_CHROMEOS)
// Allows the active user only.
// UserManager may not exist in some tests.
- if (chromeos::UserManager::IsInitialized()) {
- chromeos::UserManager* user_manager = chromeos::UserManager::Get();
+ if (user_manager::UserManager::IsInitialized()) {
+ user_manager::UserManager* user_manager =
+ user_manager::UserManager::Get();
if (chromeos::ProfileHelper::Get()->GetUserByProfile(group->profile()) !=
user_manager->GetActiveUser()) {
continue;
@@ -508,8 +509,8 @@ void MessageCenterSettingsController::RebuildNotifierGroups() {
#if defined(OS_CHROMEOS)
// ChromeOS guest login cannot get the profile from the for-loop above, so
// get the group here.
- if (notifier_groups_.empty() && chromeos::UserManager::IsInitialized() &&
- chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
+ if (notifier_groups_.empty() && user_manager::UserManager::IsInitialized() &&
+ user_manager::UserManager::Get()->IsLoggedInAsGuest()) {
// Do not invoke CreateNotifierGroupForGuestLogin() directly. In some tests,
// this method may be called before the primary profile is created, which
// means ProfileHelper::Get()->GetProfileByUser() will create a new primary