diff -Nru unity-chromium-extension-3.2.0+14.10.20140626/chromium-extension/infobar.js unity-chromium-extension-3.2.0+15.04.20150119/chromium-extension/infobar.js --- unity-chromium-extension-3.2.0+14.10.20140626/chromium-extension/infobar.js 2014-06-26 09:40:01.000000000 +0000 +++ unity-chromium-extension-3.2.0+15.04.20150119/chromium-extension/infobar.js 2015-01-19 16:49:27.000000000 +0000 @@ -1,29 +1,33 @@ var doIntegrate = function (integrate) { - chrome.tabs.getCurrent (function (tab) { - chrome.runtime.sendMessage ({tabId: tab.id, method: "on_user_infobar_request_result", integrate: integrate} - , function (response) {}); + chrome.tabs.query({currentWindow: true, active: true}, function (tabs) { + chrome.runtime.sendMessage({tabId: tabs[0].id, method: "on_user_infobar_request_result", integrate: integrate} + , function (response) {}); window.close(); }); }; window.onload = function () { chrome.runtime.getBackgroundPage(function (bg) { - document.getElementById('notintegrate').onclick = function () { doIntegrate(false); }; - document.getElementById('integrate').onclick = function () { doIntegrate(true); }; + document.getElementById('notintegrate').onclick = function () { doIntegrate(false); }; + document.getElementById('integrate').onclick = function () { doIntegrate(true); }; - chrome.tabs.getCurrent (function (tab) { - if (!bg|| !bg.background_page) { - window.close(); - return; - } - var msg = bg.background_page.getMessageForTabId(tab.id); - if (msg == null) { - window.close(); - return; - } - document.getElementById ('content').style.display = "block"; - document.getElementById ('message').innerHTML = msg || ""; - }); + chrome.tabs.query({currentWindow: true, active: true}, function (tabs) { + if (tabs.length === 0) { + window.close(); + return; + } + if (!bg || !bg.background_page) { + window.close(); + return; + } + var msg = bg.background_page.getMessageForTabId(tabs[0].id); + if (msg == null) { + window.close(); + return; + } + document.getElementById ('content').style.display = "block"; + document.getElementById ('message').innerHTML = msg || ""; + }); }); }; diff -Nru unity-chromium-extension-3.2.0+14.10.20140626/debian/changelog unity-chromium-extension-3.2.0+15.04.20150119/debian/changelog --- unity-chromium-extension-3.2.0+14.10.20140626/debian/changelog 2015-01-19 17:21:21.000000000 +0000 +++ unity-chromium-extension-3.2.0+15.04.20150119/debian/changelog 2015-01-19 17:21:21.000000000 +0000 @@ -1,12 +1,13 @@ -unity-chromium-extension (3.2.0+14.10.20140626-0ubuntu1) utopic; urgency=medium +unity-chromium-extension (3.2.0+15.04.20150119-0ubuntu1) vivid; urgency=medium [ Justin McPherson ] * Support native messaging. (with Alberto Mardegan) [ Ubuntu daily release ] * New rebuild forced + * New rebuild forced - -- Ubuntu daily release Thu, 26 Jun 2014 09:40:22 +0000 + -- Ubuntu daily release Mon, 19 Jan 2015 16:49:41 +0000 unity-chromium-extension (3.0.0+14.04.20140318-0ubuntu1) trusty; urgency=low diff -Nru unity-chromium-extension-3.2.0+14.10.20140626/debian/control unity-chromium-extension-3.2.0+15.04.20150119/debian/control --- unity-chromium-extension-3.2.0+14.10.20140626/debian/control 2015-01-19 17:21:21.000000000 +0000 +++ unity-chromium-extension-3.2.0+15.04.20150119/debian/control 2015-01-19 17:21:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: unity-chromium-extension Priority: optional Maintainer: Ubuntu Desktop Team -Build-Depends: debhelper (>= 9), +Build-Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2), + debhelper (>= 9), dh-autoreconf, libglib2.0-dev, libunity-webapps-dev (>= 1.8.0), diff -Nru unity-chromium-extension-3.2.0+14.10.20140626/messaging-host/connection.cpp unity-chromium-extension-3.2.0+15.04.20150119/messaging-host/connection.cpp --- unity-chromium-extension-3.2.0+14.10.20140626/messaging-host/connection.cpp 2014-06-26 09:40:11.000000000 +0000 +++ unity-chromium-extension-3.2.0+15.04.20150119/messaging-host/connection.cpp 2015-01-19 16:49:27.000000000 +0000 @@ -142,7 +142,7 @@ Q_D(Connection); QJsonDocument doc = QJsonDocument::fromVariant(message); - QByteArray json = doc.toJson(QJsonDocument::Compact); + QByteArray json = doc.toJson(); quint32 length = json.length(); d->m_writeChannel.write((char *)&length, sizeof(length)); d->m_writeChannel.write(json);