diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 01:38:35 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 01:38:35 +0000 |
| commit | 265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f (patch) | |
| tree | 105095d5eead4db62bbf60ed0b3f1d243b202e76 /chrome/browser/sync/profile_sync_factory.h | |
| parent | 8b20191a72da085319a68e4953e9f2b355218825 (diff) | |
| download | chromium_src-265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f.zip chromium_src-265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f.tar.gz chromium_src-265d8c32bd4dbb4b1a142c8204b434a03e8a8c8f.tar.bz2 | |
Revert 58778 - 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
TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/3310019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_factory.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_factory.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_factory.h b/chrome/browser/sync/profile_sync_factory.h index a4a2550..1ca0473 100644 --- a/chrome/browser/sync/profile_sync_factory.h +++ b/chrome/browser/sync/profile_sync_factory.h @@ -6,9 +6,7 @@ #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_H__ #pragma once -#include <string> #include <utility> - #include "base/task.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/data_type_controller.h" @@ -50,8 +48,7 @@ class ProfileSyncFactory { // Instantiates and initializes a new ProfileSyncService. Enabled // data types are registered with the service. The return pointer // is owned by the caller. - virtual ProfileSyncService* CreateProfileSyncService( - const std::string& cros_user) = 0; + virtual ProfileSyncService* CreateProfileSyncService() = 0; // Instantiates a new DataTypeManager with a SyncBackendHost and a // list of data type controllers. The return pointer is owned by |