diff options
author | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 12:05:34 +0000 |
---|---|---|
committer | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 12:05:34 +0000 |
commit | 48452c8c4fcfea5d416ff91c5eb3e19b2d8bc813 (patch) | |
tree | f3bf2665749ab013e7d01839b47ccb9fa91ac62d /remoting | |
parent | 5535123d0f1d41b06a738ec49a8410c1d7a29fe8 (diff) | |
download | chromium_src-48452c8c4fcfea5d416ff91c5eb3e19b2d8bc813.zip chromium_src-48452c8c4fcfea5d416ff91c5eb3e19b2d8bc813.tar.gz chromium_src-48452c8c4fcfea5d416ff91c5eb3e19b2d8bc813.tar.bz2 |
Chromoting browser_tests: Apps V2
The changes include:
1. Added support for unpacked extension (in addition to .crx files)
2. Replaced active_browser_ with a stack of WebContents instances to better handle multiple browser windows/tabs.
3. Added a new observer class (PageLoadNotificationObserver) for easy notification handling.
4. Handling of other apps v2 specific issues.
5. WebApp bug fixes.
BUG=134210
Review URL: https://codereview.chromium.org/26414006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/webapp/event_handlers.js | 4 | ||||
-rw-r--r-- | remoting/webapp/identity.js | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers.js index 8e000f2..208c91c 100644 --- a/remoting/webapp/event_handlers.js +++ b/remoting/webapp/event_handlers.js @@ -39,7 +39,9 @@ function onLoad() { remoting.connector.reconnect(); }; var doAuthRedirect = function() { - remoting.oauth2.doAuthRedirect(); + if (!remoting.isAppsV2) { + remoting.oauth2.doAuthRedirect(); + } }; /** @param {Event} event The event. */ var stopDaemon = function(event) { diff --git a/remoting/webapp/identity.js b/remoting/webapp/identity.js index e30e143..6aeab57 100644 --- a/remoting/webapp/identity.js +++ b/remoting/webapp/identity.js @@ -151,3 +151,12 @@ remoting.Identity.Callbacks = function(onOk, onError) { /** @type {function(remoting.Error):void} */ this.onError = onError; }; + +/** + * Returns whether the web app has authenticated with the Google services. + * + * @return {boolean} + */ +remoting.Identity.prototype.isAuthenticated = function() { + return remoting.identity.email_ != null; +}; |