diff options
| author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 23:59:13 +0000 |
|---|---|---|
| committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 23:59:13 +0000 |
| commit | 6cbd1642aa859ef93dcb25457f60c068eac0da4c (patch) | |
| tree | 44b682df26735ef92cf0f04042c1b81a0dd2b8d1 /remoting/webapp/client_screen.js | |
| parent | cf95b115d2b08f4aaa970988269b8ace60ba7283 (diff) | |
| download | chromium_src-6cbd1642aa859ef93dcb25457f60c068eac0da4c.zip chromium_src-6cbd1642aa859ef93dcb25457f60c068eac0da4c.tar.gz chromium_src-6cbd1642aa859ef93dcb25457f60c068eac0da4c.tar.bz2 | |
Apps v2 identity integration.
This CL adds support for Chrome's identity API, part of the Apps v2 migration effort:
* Add identity.js, wrapping chrome.experimental.identity and handling user consent UI automatically.
* Since the consent UI is now shown on-demand, it's better handled as an explicit overlay rather than as a AppMode, so remove home.auth.
* Move access token and email address functionality out of oauth2.js into identiry.js.
* Add stub code to simplify the transition to using the new code.
* Add patch to enable Apps v2 work-in-progress.
BUG=134213
Review URL: https://codereview.chromium.org/11769002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp/client_screen.js')
| -rw-r--r-- | remoting/webapp/client_screen.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/webapp/client_screen.js b/remoting/webapp/client_screen.js index b25fc5e..0ee39dd 100644 --- a/remoting/webapp/client_screen.js +++ b/remoting/webapp/client_screen.js @@ -216,7 +216,7 @@ function onClientStateChange_(oldState, newState) { showConnectError_(remoting.Error.BAD_PLUGIN_VERSION); } else if (newState == remoting.ClientSession.State.CONNECTING) { - console.log('Connecting as ' + remoting.oauth2.getCachedEmail()); + console.log('Connecting as ' + remoting.identity.getCachedEmail()); } else if (newState == remoting.ClientSession.State.INITIALIZING) { console.log('Initializing connection'); |