Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: remoting/webapp/me2mom/remoting.js

Issue 8782001: Refactored HostList to better support bookmarking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge bug. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/webapp/me2mom/host_table_entry.js ('k') | remoting/webapp/me2mom/ui_mode.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/me2mom/remoting.js
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index 33de90042581d7be8a67e127ee1272d65f8ea9e8..76e32cf9cbec7604eec23c23b9f1b8894146ded7 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -20,7 +20,8 @@ remoting.Error = {
HOST_IS_OFFLINE: /*i18n-content*/'ERROR_HOST_IS_OFFLINE',
INCOMPATIBLE_PROTOCOL: /*i18n-content*/'ERROR_INCOMPATIBLE_PROTOCOL',
BAD_PLUGIN_VERSION: /*i18n-content*/'ERROR_BAD_PLUGIN_VERSION',
- GENERIC: /*i18n-content*/'ERROR_GENERIC'
+ GENERIC: /*i18n-content*/'ERROR_GENERIC',
+ UNEXPECTED: /*i18n-content*/'ERROR_UNEXPECTED'
};
(function() {
@@ -55,10 +56,8 @@ remoting.init = function() {
var urlParams = getUrlParameters();
if ('mode' in urlParams) {
if (urlParams['mode'] == 'me2me') {
- var hostJid = urlParams['hostJid'];
- var hostPublicKey = urlParams['hostPublicKey'];
- var hostName = urlParams['hostName'];
- remoting.connectHost(hostJid, hostPublicKey, hostName);
+ var hostId = urlParams['hostId'];
+ remoting.connectHost(hostId, true);
return;
}
}
« no previous file with comments | « remoting/webapp/me2mom/host_table_entry.js ('k') | remoting/webapp/me2mom/ui_mode.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698