summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorweitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-09 17:15:57 +0000
committerweitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-09 17:15:57 +0000
commit40cd4468d84e6ad0c9f08ccaeb30ebe64bd622cd (patch)
treee18037d27052bb97e966710ff8691506354626f7 /remoting
parent571bfa9d16dc9f94f0335f8ba569e6fba0e40656 (diff)
downloadchromium_src-40cd4468d84e6ad0c9f08ccaeb30ebe64bd622cd.zip
chromium_src-40cd4468d84e6ad0c9f08ccaeb30ebe64bd622cd.tar.gz
chromium_src-40cd4468d84e6ad0c9f08ccaeb30ebe64bd622cd.tar.bz2
Issue 225078: Web-app briefly shows error state when loading for the first time. Fix: Don't show the error dialog for NOT_AUTHENTICATED error because we will show the auth-dialog anyway.
BUG=225078 Review URL: https://chromiumcodereview.appspot.com/15064002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/remoting.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/remoting/webapp/remoting.js b/remoting/webapp/remoting.js
index 68928fe..d22b7d3 100644
--- a/remoting/webapp/remoting.js
+++ b/remoting/webapp/remoting.js
@@ -64,7 +64,16 @@ remoting.init = function() {
document.getElementById('wcs-sandbox');
remoting.wcsSandbox = new remoting.WcsSandboxContainer(sandbox.contentWindow);
- remoting.identity.getEmail(remoting.onEmail, remoting.showErrorMessage);
+ /** @param {remoting.Error} error */
+ var onGetEmailError = function(error) {
+ // No need to show the error message for NOT_AUTHENTICATED
+ // because we will show "auth-dialog".
+ if (error != remoting.Error.NOT_AUTHENTICATED) {
+ remoting.showErrorMessage(error);
+ }
+ }
+
+ remoting.identity.getEmail(remoting.onEmail, onGetEmailError);
remoting.showOrHideIT2MeUi();
remoting.showOrHideMe2MeUi();