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

Unified Diff: chrome/browser/sync/signin_manager.h

Issue 7121014: When a user logs into sync, the appropriate cookies are retrieved so that (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixing merge issue that caused previous trybots to fail Created 9 years, 6 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/about_flags.cc ('k') | chrome/browser/sync/signin_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/signin_manager.h
===================================================================
--- chrome/browser/sync/signin_manager.h (revision 88668)
+++ chrome/browser/sync/signin_manager.h (working copy)
@@ -16,6 +16,8 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "chrome/common/net/gaia/google_service_auth_error.h"
+#include "content/common/notification_observer.h"
+#include "content/common/notification_registrar.h"
class GaiaAuthFetcher;
class Profile;
@@ -33,7 +35,13 @@
std::string password;
};
+#if !defined(OS_CHROMEOS)
+class SigninManager : public GaiaAuthConsumer ,
+ public NotificationObserver {
+#else
class SigninManager : public GaiaAuthConsumer {
+#endif
+
public:
SigninManager();
virtual ~SigninManager();
@@ -75,6 +83,13 @@
virtual void OnGetUserInfoKeyNotFound(const std::string& key);
virtual void OnGetUserInfoFailure(const GoogleServiceAuthError& error);
+#if !defined(OS_CHROMEOS)
tim (not reviewing) 2011/06/14 13:18:29 maybe we should create a const in browser/defaults
Roger Tawa OOO till Jul 10th 2011/06/14 18:42:43 I don't want to compile any of this code in the ca
+ // NotificationObserver
+ virtual void Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details);
+#endif
+
private:
Profile* profile_;
std::string username_;
@@ -87,6 +102,11 @@
// Actual client login handler.
scoped_ptr<GaiaAuthFetcher> client_login_;
+
+#if !defined(OS_CHROMEOS)
+ // Register for notifications from the TokenService.
+ NotificationRegistrar registrar_;
+#endif
};
#endif // CHROME_BROWSER_SYNC_SIGNIN_MANAGER_H_
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/sync/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698