summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile_impl.h
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 00:06:34 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 00:06:34 +0000
commit478dbee251a327e6e678f15512f204a67b2f7f1f (patch)
tree151dd1e2887711e299c08ce8872c382a56452778 /chrome/browser/profile_impl.h
parent3f4e4665beaa1396d970e4317cf04194197d8a08 (diff)
downloadchromium_src-478dbee251a327e6e678f15512f204a67b2f7f1f.zip
chromium_src-478dbee251a327e6e678f15512f204a67b2f7f1f.tar.gz
chromium_src-478dbee251a327e6e678f15512f204a67b2f7f1f.tar.bz2
New authorization framework for sync.
To quote chron's original patch (http://codereview.chromium.org/3148036/show) <blockquote> This patch removes: authenticator.cc, auth_watcher.cc removes calls to user_settings.cc, removes an authenticate PB request to the server, and moves token storage into the Chrome TokenService. This patch introduces the SigninManager, which is an interim solution for user management prior to moving the system into chrome. Other changes include removing the dependency on the sync backend to be running while the sync wizard is intially displayed. This means that the backend can be brought up in response to credentials becoming available. The backend now is always provided credentials on startup. If an auth error occurs, it propogates it up via a notification. Some event handlers were removed and streamlined for more straightforward sync system startup. </blockquote> BUG=51001, 50293, 35158 TEST=Unit tests && Start up sync, log in, log out, run with expired credentials, run with new gaia credentials, run with gaia credentials updated while system is syncing. Try logging in with incorrect username. Trigger CAPTCHA. Try logging out and in repeatedly. Check about:sync works. Try going offline and back online again. Expire gaia credentials and try renewing it with the UI dialog. Review URL: http://codereview.chromium.org/3305003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile_impl.h')
-rw-r--r--chrome/browser/profile_impl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/profile_impl.h b/chrome/browser/profile_impl.h
index d3831cb..79e4438 100644
--- a/chrome/browser/profile_impl.h
+++ b/chrome/browser/profile_impl.h
@@ -100,8 +100,10 @@ class ProfileImpl : public Profile,
virtual FilePath last_selected_directory();
virtual void set_last_selected_directory(const FilePath& path);
virtual ProfileSyncService* GetProfileSyncService();
+ virtual ProfileSyncService* GetProfileSyncService(
+ const std::string& cros_user);
virtual TokenService* GetTokenService();
- void InitSyncService();
+ void InitSyncService(const std::string& cros_user);
virtual CloudPrintProxyService* GetCloudPrintProxyService();
void InitCloudPrintProxyService();
virtual ChromeBlobStorageContext* GetBlobStorageContext();