Index: chrome/browser/chromeos/login/user_manager.cc |
=================================================================== |
--- chrome/browser/chromeos/login/user_manager.cc (revision 91880) |
+++ chrome/browser/chromeos/login/user_manager.cc (working copy) |
@@ -32,8 +32,8 @@ |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
#include "content/browser/browser_thread.h" |
+#include "content/common/content_notification_types.h" |
#include "content/common/notification_service.h" |
-#include "content/common/notification_type.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/codec/png_codec.h" |
@@ -103,7 +103,7 @@ |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
g_user_manager.Get().set_current_user_is_owner(is_owner); |
- NotificationService::current()->Notify(NotificationType::OWNERSHIP_CHECKED, |
+ NotificationService::current()->Notify(chrome::OWNERSHIP_CHECKED, |
NotificationService::AllSources(), |
NotificationService::NoDetails()); |
if (is_owner) { |
@@ -537,7 +537,7 @@ |
if (should_save_image) |
SaveUserImage(username, image); |
NotificationService::current()->Notify( |
- NotificationType::LOGIN_USER_IMAGE_CHANGED, |
+ chrome::LOGIN_USER_IMAGE_CHANGED, |
Source<UserManager>(this), |
Details<const User>(&user)); |
} |
@@ -552,7 +552,7 @@ |
current_user_is_owner_(false), |
current_user_is_new_(false), |
user_is_logged_in_(false) { |
- registrar_.Add(this, NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED, |
+ registrar_.Add(this, chrome::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED, |
NotificationService::AllSources()); |
} |
@@ -602,7 +602,7 @@ |
void UserManager::NotifyOnLogin() { |
NotificationService::current()->Notify( |
- NotificationType::LOGIN_USER_CHANGED, |
+ chrome::LOGIN_USER_CHANGED, |
Source<UserManager>(this), |
Details<const User>(&logged_in_user_)); |
@@ -629,10 +629,10 @@ |
NewRunnableFunction(&CheckOwnership)); |
} |
-void UserManager::Observe(NotificationType type, |
+void UserManager::Observe(int type, |
const NotificationSource& source, |
const NotificationDetails& details) { |
- if (type == NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) { |
+ if (type == chrome::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) { |
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
NewRunnableFunction(&CheckOwnership)); |
} |