diff options
author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:36:39 +0000 |
---|---|---|
committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:36:39 +0000 |
commit | e8234d36dc74d94f4921cadde17064ececae16b1 (patch) | |
tree | 729ddf445ee544fe584906b16a77960a670caa77 /chrome/browser/gtk/options/content_page_gtk.cc | |
parent | 475ad1925e8a3af6ffcc32d874942550c434dc1a (diff) | |
download | chromium_src-e8234d36dc74d94f4921cadde17064ececae16b1.zip chromium_src-e8234d36dc74d94f4921cadde17064ececae16b1.tar.gz chromium_src-e8234d36dc74d94f4921cadde17064ececae16b1.tar.bz2 |
2nd attempt at http://codereview.chromium.org/3305003/show
The difference between this patch and the other one is plumbing setup_in_test_mode through the Initialization process, rather than using a separate SetupInTestMode() method, which happens too late to safely stop the syncer thread. [see syncapi.cc|h for most of the changes.]
---
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.
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/3342025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/content_page_gtk.cc')
-rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index c72a530..a9b09d5 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -592,7 +592,7 @@ void ContentPageGtk::OnSyncStartStopButtonClicked(GtkWidget* widget) { gtk_util::ShowDialog(dialog); return; } else { - sync_service_->EnableForUser(NULL); + sync_service_->ShowLoginDialog(NULL); ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS); } } |