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

Unified Diff: chrome/browser/sync/signin_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
« no previous file with comments | « chrome/browser/sync/signin_manager.h ('k') | chrome/browser/sync/signin_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/signin_manager.cc
===================================================================
--- chrome/browser/sync/signin_manager.cc (revision 91968)
+++ chrome/browser/sync/signin_manager.cc (working copy)
@@ -10,6 +10,7 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/chrome_switches.h"
@@ -42,10 +43,10 @@
void SigninManager::CleanupNotificationRegistration() {
#if !defined(OS_CHROMEOS)
if (registrar_.IsRegistered(this,
- NotificationType::TOKEN_AVAILABLE,
+ chrome::NOTIFICATION_TOKEN_AVAILABLE,
NotificationService::AllSources())) {
registrar_.Remove(this,
- NotificationType::TOKEN_AVAILABLE,
+ chrome::NOTIFICATION_TOKEN_AVAILABLE,
NotificationService::AllSources());
}
#endif
@@ -92,7 +93,7 @@
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableAutoLogin)) {
registrar_.Add(this,
- NotificationType::TOKEN_AVAILABLE,
+ chrome::NOTIFICATION_TOKEN_AVAILABLE,
NotificationService::AllSources());
}
#endif
@@ -147,7 +148,7 @@
GoogleServiceSigninSuccessDetails details(username_, password_);
NotificationService::current()->Notify(
- NotificationType::GOOGLE_SIGNIN_SUCCESSFUL,
+ chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
Source<Profile>(profile_),
Details<const GoogleServiceSigninSuccessDetails>(&details));
@@ -180,7 +181,7 @@
void SigninManager::OnClientLoginFailure(const GoogleServiceAuthError& error) {
NotificationService::current()->Notify(
- NotificationType::GOOGLE_SIGNIN_FAILED,
+ chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
Source<Profile>(profile_),
Details<const GoogleServiceAuthError>(&error));
@@ -198,11 +199,11 @@
SignOut();
}
-void SigninManager::Observe(NotificationType type,
+void SigninManager::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
#if !defined(OS_CHROMEOS)
- DCHECK(type == NotificationType::TOKEN_AVAILABLE);
+ DCHECK(type == chrome::NOTIFICATION_TOKEN_AVAILABLE);
TokenService::TokenAvailableDetails* tok_details =
Details<TokenService::TokenAvailableDetails>(details).ptr();
« no previous file with comments | « chrome/browser/sync/signin_manager.h ('k') | chrome/browser/sync/signin_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698