diff options
| author | jamiewalch <jamiewalch@chromium.org> | 2015-02-10 09:49:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-10 17:49:59 +0000 |
| commit | c1f445911d153d2e59b6c917295c202eda4cfb91 (patch) | |
| tree | 36de5668b3dc804a28ab2a4ef6731f644674cef8 /remoting | |
| parent | 9aa84219574023c7cff4c6b28d0cf376717a4abf (diff) | |
| download | chromium_src-c1f445911d153d2e59b6c917295c202eda4cfb91.zip chromium_src-c1f445911d153d2e59b6c917295c202eda4cfb91.tar.gz chromium_src-c1f445911d153d2e59b6c917295c202eda4cfb91.tar.bz2 | |
Switch feedback consent dialog to use oauth2_api_impl.
This was broken by https://codereview.chromium.org/840023004/ and was not
caught because we don't auto-generate feedback_consent.html, nor do we run
it through jscompile.
BUG=457044
Review URL: https://codereview.chromium.org/907203002
Cr-Commit-Position: refs/heads/master@{#315586}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/app_remoting/html/feedback_consent.html | 2 | ||||
| -rw-r--r-- | remoting/webapp/app_remoting/js/feedback_consent.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/remoting/webapp/app_remoting/html/feedback_consent.html b/remoting/webapp/app_remoting/html/feedback_consent.html index 5cd53a0..adaf745 100644 --- a/remoting/webapp/app_remoting/html/feedback_consent.html +++ b/remoting/webapp/app_remoting/html/feedback_consent.html @@ -15,7 +15,7 @@ found in the LICENSE file. <link rel="stylesheet" href="message_window.css"> <script src="error.js"></script> <script src="feedback_consent.js"></script> - <script src="oauth2_api.js"></script> + <script src="oauth2_api_impl.js"></script> <script src="plugin_settings.js"></script> <script src="l10n.js"></script> <script src="xhr.js"></script> diff --git a/remoting/webapp/app_remoting/js/feedback_consent.js b/remoting/webapp/app_remoting/js/feedback_consent.js index 7bc7d3d..6691ed2 100644 --- a/remoting/webapp/app_remoting/js/feedback_consent.js +++ b/remoting/webapp/app_remoting/js/feedback_consent.js @@ -111,7 +111,8 @@ function generateId() { */ function onToken(token) { var getUserInfo = function() { - remoting.OAuth2Api.getUserInfo( + var oauth2Api = new remoting.OAuth2ApiImpl(); + oauth2Api.getUserInfo( onUserInfo, onUserInfo.bind(null, 'unknown', 'unknown'), token); }; if (!token) { |