diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 22:50:41 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 22:50:41 +0000 |
| commit | 0c6ded8a410d85b18ea0514032898ca5d6b72d1a (patch) | |
| tree | a2a7721d0d573c47f98a35c68b3fe869e56d2463 /chrome/browser/ui/webui/sync_setup_browsertest.js | |
| parent | 68c75bb729e661cb36a129dc5ecdbd50c2b00cc2 (diff) | |
| download | chromium_src-0c6ded8a410d85b18ea0514032898ca5d6b72d1a.zip chromium_src-0c6ded8a410d85b18ea0514032898ca5d6b72d1a.tar.gz chromium_src-0c6ded8a410d85b18ea0514032898ca5d6b72d1a.tar.bz2 | |
No longer display login when oauth token not available.
Now always display sync config screen if sync is already configured. Changed app oauth flow to explicitly force the login screen via a special URL rather than having logic in SyncSetupHandler.
Changed ProfileSyncService to stop listening to GAIA_SIGNIN_FAILED notifications and treating them as sync errors - this was causing infinite spin when using ASPs because ASP prompts look like auth errors.
BUG=118533, 113552
TEST=make sure app notification signin flow still works
Review URL: http://codereview.chromium.org/9724016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/sync_setup_browsertest.js')
| -rw-r--r-- | chrome/browser/ui/webui/sync_setup_browsertest.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/sync_setup_browsertest.js b/chrome/browser/ui/webui/sync_setup_browsertest.js index a625569..11d9799 100644 --- a/chrome/browser/ui/webui/sync_setup_browsertest.js +++ b/chrome/browser/ui/webui/sync_setup_browsertest.js @@ -48,7 +48,7 @@ SyncSetupWebUITest.prototype = { OptionsPage.navigateToPage('syncSetup'); })); - this.mockHandler.expects(once()).SyncSetupAttachHandler(). + this.mockHandler.expects(once()).SyncSetupAttachHandler(NOT_NULL). will(callFunction(function() { SyncSetupOverlay.showSyncSetupPage( 'login', { |