| Index: trunk/src/chrome/browser/resources/hangout_services/thunk.js
|
| ===================================================================
|
| --- trunk/src/chrome/browser/resources/hangout_services/thunk.js (revision 273764)
|
| +++ trunk/src/chrome/browser/resources/hangout_services/thunk.js (working copy)
|
| @@ -75,11 +75,9 @@
|
| sender.tab.id, origin, doSendResponse);
|
| return true;
|
| } else if (method == 'logging.stopAndUpload') {
|
| - stopAllRtpDump(sender.tab.id, origin, function() {
|
| - chrome.webrtcLoggingPrivate.stop(sender.tab.id, origin, function() {
|
| - chrome.webrtcLoggingPrivate.upload(
|
| - sender.tab.id, origin, doSendResponse);
|
| - });
|
| + chrome.webrtcLoggingPrivate.stop(sender.tab.id, origin, function() {
|
| + chrome.webrtcLoggingPrivate.upload(
|
| + sender.tab.id, origin, doSendResponse);
|
| });
|
| return true;
|
| } else if (method == 'logging.discard') {
|
| @@ -117,18 +115,6 @@
|
| doSendResponse(obj.nacl_arch);
|
| });
|
| return true;
|
| - } else if (method == 'logging.startRtpDump') {
|
| - var incoming = message['incoming'] || false;
|
| - var outgoing = message['outgoing'] || false;
|
| - chrome.webrtcLoggingPrivate.startRtpDump(
|
| - sender.tab.id, origin, incoming, outgoing, doSendResponse);
|
| - return true;
|
| - } else if (method == 'logging.stopRtpDump') {
|
| - var incoming = message['incoming'] || false;
|
| - var outgoing = message['outgoing'] || false;
|
| - chrome.webrtcLoggingPrivate.stopRtpDump(
|
| - sender.tab.id, origin, incoming, outgoing, doSendResponse);
|
| - return true;
|
| }
|
| throw new Error('Unknown method: ' + method);
|
| } catch (e) {
|
| @@ -222,17 +208,6 @@
|
| });
|
| }
|
|
|
| -function stopAllRtpDump(tabId, origin, callback) {
|
| - // Stops incoming and outgoing separately, otherwise stopRtpDump will fail if
|
| - // either type of dump has not been started.
|
| - chrome.webrtcLoggingPrivate.stopRtpDump(
|
| - tabId, origin, true, false,
|
| - function() {
|
| - chrome.webrtcLoggingPrivate.stopRtpDump(
|
| - tabId, origin, false, true, callback);
|
| - });
|
| -}
|
| -
|
| chrome.runtime.onConnectExternal.addListener(function(port) {
|
| if (port.name == 'onSinksChangedListener') {
|
| onSinksChangedPort(port);
|
|
|