Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4833)

Unified Diff: chrome/browser/notifications/message_center_settings_controller.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/notifications/message_center_settings_controller.h ('k') | chrome/browser/policy/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/notifications/message_center_settings_controller.cc
diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc
index 1278631549abd3b352e4b876e1450e06b3474bc9..7d03bd6fc017d6c0ff674c1c88b135e06a74a757 100644
--- a/chrome/browser/notifications/message_center_settings_controller.cc
+++ b/chrome/browser/notifications/message_center_settings_controller.cc
@@ -411,7 +411,7 @@ void MessageCenterSettingsController::OnFaviconLoaded(
#if defined(OS_CHROMEOS)
void MessageCenterSettingsController::ActiveUserChanged(
- const chromeos::User* active_user) {
+ const user_manager::User* active_user) {
RebuildNotifierGroups();
}
#endif
@@ -452,7 +452,7 @@ void MessageCenterSettingsController::CreateNotifierGroupForGuestLogin() {
if (!user_manager->IsLoggedInAsGuest())
return;
- chromeos::User* user = user_manager->GetActiveUser();
+ user_manager::User* user = user_manager->GetActiveUser();
Profile* profile = chromeos::ProfileHelper::Get()->GetProfileByUser(user);
DCHECK(profile);
notifier_groups_.push_back(
« no previous file with comments | « chrome/browser/notifications/message_center_settings_controller.h ('k') | chrome/browser/policy/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698