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

Unified Diff: chrome/browser/chromeos/login/user_manager.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
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));
}

Powered by Google App Engine
This is Rietveld 408576698