Merge lp:~justinmcp/unity-chromium-extension/1469601 into lp:unity-chromium-extension

[Justin McPherson]

[David Barth (dbarth)]

lgtm

[lp:~justinmcp/unity-chromium-extension/1469601]

257. By Justin McPherson on 2016-05-11

Add check for new enumeration value in Qt >= 5.5.

Unmerged revisions

257. By Justin McPherson on 2016-05-11

Add check for new enumeration value in Qt >= 5.5.

256. By Justin McPherson <justin@phablet-dev> on 2015-06-30

WIP

255. By Justin McPherson <justin@phablet-dev> on 2015-06-30

WIP

254. By Justin McPherson <justin@phablet-dev> on 2015-06-30

WIP

253. By Justin McPherson <justin@phablet-dev> on 2015-06-30

WIP

252. By Justin McPherson <justin@phablet-dev> on 2015-06-29

WIP

251. By Justin McPherson <justin@phablet-dev> on 2015-06-29

WIP

250. By Justin McPherson <justin@phablet-dev> on 2015-06-29

WIP

=== modified file 'chromium-extension/background-page.js'
--- chromium-extension/background-page.js	2014-06-20 06:16:48 +0000
+++ chromium-extension/background-page.js	2016-05-11 04:47:43 +0000
@@ -1,17 +1,17 @@
 /* Chromium Unity integration extension
- * 
+ *
  *   Copyright 2012 Canonical Ltd.
  *
- *   This program is free software: you can redistribute it and/or modify it 
- *   under the terms of the GNU General Public License version 3, as published 
+ *   This program is free software: you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License version 3, as published
  *   by the Free Software Foundation.
  *
- *   This program is distributed in the hope that it will be useful, but 
- *   WITHOUT ANY WARRANTY; without even the implied warranties of 
- *   MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranties of
+ *   MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
  *   PURPOSE.  See the GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License along 
+ *   You should have received a copy of the GNU General Public License along
  *   with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
@@ -22,7 +22,7 @@
     var host_callbacks = [];
 
     var portListener = function (msg) {
-        callback = host_callbacks.pop();  
+        callback = host_callbacks.pop();
         if (callback === undefined) {
             return;
         }
@@ -30,12 +30,10 @@
     };
 
     var portDisconnecter = function () {
-        console.log('UCX: port disconnected');
-        port = null
+        port = null;
     };
 
     var sendNativeMessage = function (msg, callback) {
-        console.log("UCX: sendnativemessage: port=" + port);
         if (port === null) {
             port = chrome.runtime.connectNative(HOST_ADDRESS);
             port.onMessage.addListener(portListener);
@@ -50,46 +48,42 @@
 
 
     /////////////////////////////////////////////////////////
-    // 
-    // Scafolding to keep track of data associated w/ infobar requests 
+    //
+    // Scafolding to keep track of data associated w/ pageaction requests
     // (Chromium's structure imposes some kind of state being maintained
-    // in order to communicate data) 
-    // 
+    // in order to communicate data)
+    //
     ////////////////////////////////////////////////////////
-    // 
+    //
     // list of callback that are to be called asynchronously
     //  per tab. Used in the user integration/installation resquests context.
-    // 
-    // One thing to keep in mind is that one constraint, that bring some amount of
-    //  'soundness' is that there is a hard limit (provided by the browser) of one infobar per tab.
 
-    var user_infobar_request_callbacks = {};
-    var addInfobarRequestCallbackFor = function (infobarRequestId, callback, message, details) {
-        user_infobar_request_callbacks[infobarRequestId] = {
+    var user_popup_request_callbacks = {};
+    var addPopupRequestCallbackFor = function (popupRequestId, callback, message, details) {
+        user_popup_request_callbacks[popupRequestId] = {
             callback: callback,
             message: message,
             details: details
         };
     };
 
-    var getDataIfAnyFor = function (infobarRequestId) {
-        if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
+    var getDataIfAnyFor = function (popupRequestId) {
+        if (user_popup_request_callbacks[popupRequestId] === undefined) {
             return "";
         }
         return {
-            message: user_infobar_request_callbacks[infobarRequestId].message,
-            details: user_infobar_request_callbacks[infobarRequestId].details
+            message: user_popup_request_callbacks[popupRequestId].message,
+            details: user_popup_request_callbacks[popupRequestId].details
         };
     };
-
-    var invokeAndRemoveCallbackIfAnyFor = function (infobarRequestId, arguments) {
-        if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
+    var invokeAndRemoveCallbackIfAnyFor = function (popupRequestId, args) {
+        if (user_popup_request_callbacks[popupRequestId] === undefined) {
             return;
         }
-        var callback = user_infobar_request_callbacks[infobarRequestId].callback;
-        user_infobar_request_callbacks[infobarRequestId] = undefined;
+        var callback = user_popup_request_callbacks[popupRequestId].callback;
+        user_popup_request_callbacks[popupRequestId] = undefined;
         if (typeof(callback) === 'function') {
-            callback(arguments);
+            callback(args);
         }
     };
 
@@ -106,35 +100,37 @@
             },
             function (response) {
                 if (response.available) {
-                    addInfobarRequestCallbackFor(
+                    addPopupRequestCallbackFor(
                         windowInfos.tabId,
                         function (result) {
                             if (result && result.integrate) {
                                 sendNativeMessage({
                                     "method" : "install",
                                     "url" : url
-                                })
+                                });
                             } else {
                                 sendNativeMessage({
                                     "method" : "dont_ask",
                                     "url" : url
-                                })
+                                });
                             }
+
+                            chrome.pageAction.hide(windowInfos.tabId);
                         },
                         chrome.i18n.getMessage("integration_copy", [ response.appName, response.appDomain ]),
                         null);
 
-                    chrome.infobars.show({ tabId: windowInfos.tabId, path: "infobar.html" });
+                    chrome.pageAction.show(windowInfos.tabId);
                 }
             });
-    }; 
-   
-   
+    };
+
+
    // {{{ main request handler
-   
+
    /**
     * Handles & responds to content script requests.
-    * 
+    *
     */
     var init_requested_stamps = {};
     var contentScriptsRequestHandler = function (request, sender, callback) {
@@ -144,10 +140,10 @@
                     logging: false,
                     incognito: sender.tab.incognito
                 };
-	 
+
                 try {
                     if (window.localStorage) {
-                       settings.logging = localStorage['logging'];
+                       settings.logging = localStorage.logging;
                     }
                 }
                 catch (e) {
@@ -156,8 +152,8 @@
 
 	            callback (settings);
             },
-            on_user_infobar_request_result: function (request, sender, callback) {
-                invokeAndRemoveCallbackIfAnyFor (request.tabId, request);
+            on_user_popup_request_result: function (request, sender, callback) {
+                invokeAndRemoveCallbackIfAnyFor(request.tabId, request);
             },
             init_requested: function (request, sender, callback) {
                 sendNativeMessage({
@@ -166,30 +162,32 @@
                     },
                     function (response) {
                         if (response.available) {
-                            addInfobarRequestCallbackFor(
+                            addPopupRequestCallbackFor(
                                 sender.tab.id,
                                 function (result) {
                                     if (result && result.integrate) {
                                         sendNativeMessage({
                                             "method" : "install",
                                             "url" : request.options.url
-                                        })
+                                        });
                                     } else {
                                         sendNativeMessage({
                                             "method" : "dont_ask",
                                             "url" : request.options.url
-                                        })
+                                        });
                                     }
+
+                                    chrome.pageAction.hide(windowInfos.tabId);
                                 },
                                 chrome.i18n.getMessage("integration_copy", [ response.appName, response.appDomain ]),
                                 null);
 
-                            chrome.infobars.show({ tabId: windowInfos.tabId, path: "infobar.html" });
+                            chrome.pageAction.show(windowInfos.tabId);
                         }
                     });
             }
         };
-     
+
         // validate request
         if (!request  || !request.method) {
             callback({ error: "Invalid request structure" });
@@ -200,20 +198,18 @@
             return true;
         }
 
-        if (typeof(request.method) != 'string' || request.method.length == 0) {
+        if (typeof(request.method) != 'string' || request.method.length === 0) {
             callback({ error: "Invalid request method" });
             return true;
         }
 
-        console.log('Got request: ' + request.method);
-
         var handler = handlers [request.method];
         if (handler !== undefined && typeof(handler) == 'function') {
             handler(request, sender, callback);
             return true;
         }
         return false;
-    }
+    };
 
     // Main event handler and communication link
     //   w/ content scripts
@@ -221,18 +217,16 @@
     // }}}
 
     ///////////////////////////////////////////////////////////////////////
-    // 
+    //
     // Window management related functions. In chromeless mode, we have specific
     //  rules for tab management to make webapps feel more "native" than plain
     //  web applications.
-    // 
+    //
     ///////////////////////////////////////////////////////////////////////
 
     var onTabChanged = function (tabId, windowId, url) {
         var onInstalled = function (installed, packageName, appName, appDomain) { };
 
-        console.log("onTabChanged: " + url);
-
         matchesIntegrationScripts(
             null, //plugin,
             url,
@@ -255,15 +249,24 @@
 
     chrome.tabs.onUpdated.addListener(
         function(tabId, changeInfo, tab) {
-            console.log("onUpdated " + changeInfo.url);
             if (changeInfo && changeInfo.url) {
                 onTabChanged(tabId, tab.windowId, changeInfo.url);
             }
         }
     );
 
+    chrome.tabs.onReplaced.addListener(
+        function(addedTabId, removedTabId) {
+            chrome.tabs.get(addedTabId, function(tab) {
+                if (tab && tab.url) {
+                    onTabChanged(addedTabId, tab.windowId, tab.url);
+                }
+            });
+        }
+    );
+
     /*
-     *  Returns a potential message associated with a tab id (infobar)
+     *  Returns a potential message associated with a tab id (popup)
      */
     return {
         getMessageForTabId: function (tabId)  {

=== modified file 'chromium-extension/chromium-extension.pro'
--- chromium-extension/chromium-extension.pro	2014-05-21 12:53:43 +0000
+++ chromium-extension/chromium-extension.pro	2016-05-11 04:47:43 +0000
@@ -12,9 +12,9 @@
     background-page.js \
     base-content-script.js \
     browser.js \
-    infobar.css \
-    infobar.html \
-    infobar.js \
+    popup.css \
+    popup.html \
+    popup.js \
     _locales \
     options.html \
     options.js \

=== removed file 'chromium-extension/infobar.css'
--- chromium-extension/infobar.css	2012-05-16 18:19:03 +0000
+++ chromium-extension/infobar.css	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-body {
-  background: -webkit-linear-gradient(#E9E9E9, #DADADA);
-  font-family:  Tahoma, Geneva, sans-serif;
-  font-size: 13px;
-  height: 36px; /* Infobars are limited to 36-72px */
-  margin: 0;
-  overflow: hidden;
-  padding-left: 6px;
-  padding-right: 6px;
-  padding-top: 5px;
-}
-
-img {
-  padding-right: 6px;
-}
-
-button {
-  padding-right: 10px;
-}
-

=== removed file 'chromium-extension/infobar.html'
--- chromium-extension/infobar.html	2012-10-12 01:18:07 +0000
+++ chromium-extension/infobar.html	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<html>
-
-<head>
-</head>
-
-<link rel="stylesheet" type="text/css" href="infobar.css"></link>
-<script src="infobar.js"></script>
-
-<body>
-
-<div id="content" style="display:none">
-  <span id="message"></span>
-  <input type="button" id="notintegrate" value="Never for this site" />
-  <input type="button" id="integrate" value="Yes" onclick="doIntegrate(true)"/>
-</div>
-
-</body>
-
-
-</html>

=== removed file 'chromium-extension/infobar.js'
--- chromium-extension/infobar.js	2014-11-18 07:07:15 +0000
+++ chromium-extension/infobar.js	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-var doIntegrate = function (integrate) {
-  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); };
-
-    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 || "";
-    });
-  });
-};
-

=== modified file 'chromium-extension/manifest.json.in'
--- chromium-extension/manifest.json.in	2014-05-21 12:22:21 +0000
+++ chromium-extension/manifest.json.in	2016-05-11 04:47:43 +0000
@@ -19,17 +19,25 @@
   '"icons"': {
     '"16": "skin/cof-16.png"',
     '"48": "skin/cof-48.png"'
-  },    
+  },
 
   '"default_locale": "en"',
 
   '"background"': {
     '"page"': '"background-page.html"'
-  },  
+  },
 
-  '"permissions": ["tabs", "http://*/*", "infobars", "nativeMessaging"]',
+  '"permissions": ["tabs", "http://*/*", "nativeMessaging"]',
+  '"page_action"': {
+    '"default_icon"': {
+      '"19"': '"skin/cof-16.png"',
+      '"38"': '"skin/cof-48.png"'
+    },
+    '"default_title"': '"Unity Webapps"',
+    '"default_popup"': '"popup.html"'
+  },
   '"options_page": "options.html"',
-  
+
   '"content_scripts"': [
     {
       '"all_frames"': true,

=== modified file 'chromium-extension/options.js'
--- chromium-extension/options.js	2012-11-08 18:15:19 +0000
+++ chromium-extension/options.js	2016-05-11 04:47:43 +0000
@@ -9,8 +9,8 @@
       document.getElementById('logging').disabled = true;
       return;
   }
- 
-  var logging = localStorage["logging"];
+
+  var logging = localStorage.logging;
   var loggingElt = document.getElementById("logging");
   if (loggingElt) {
     loggingElt.checked = (logging == "true");

=== added file 'chromium-extension/popup.css'
--- chromium-extension/popup.css	1970-01-01 00:00:00 +0000
+++ chromium-extension/popup.css	2016-05-11 04:47:43 +0000
@@ -0,0 +1,21 @@
+body {
+  background: -webkit-linear-gradient(#E9E9E9, #DADADA);
+  font-family:  Tahoma, Geneva, sans-serif;
+  font-size: 13px;
+  height: 36px;
+  width: 300px;
+  margin: 0;
+  overflow: hidden;
+  padding-left: 6px;
+  padding-right: 6px;
+  padding-top: 5px;
+}
+
+img {
+  padding-right: 6px;
+}
+
+button {
+  padding-right: 10px;
+}
+

=== added file 'chromium-extension/popup.html'
--- chromium-extension/popup.html	1970-01-01 00:00:00 +0000
+++ chromium-extension/popup.html	2016-05-11 04:47:43 +0000
@@ -0,0 +1,20 @@
+<html>
+
+<head>
+</head>
+
+<link rel="stylesheet" type="text/css" href="popup.css"></link>
+<script src="popup.js"></script>
+
+<body>
+
+<div id="content" style="display:none">
+  <span id="message"></span>
+  <input type="button" id="notintegrate" value="Never for this site" />
+  <input type="button" id="integrate" value="Yes" onclick="doIntegrate(true)"/>
+</div>
+
+</body>
+
+
+</html>

=== added file 'chromium-extension/popup.js'
--- chromium-extension/popup.js	1970-01-01 00:00:00 +0000
+++ chromium-extension/popup.js	2016-05-11 04:47:43 +0000
@@ -0,0 +1,33 @@
+var doIntegrate = function (integrate) {
+  chrome.tabs.query({currentWindow: true, active: true}, function (tabs) {
+    chrome.runtime.sendMessage({tabId: tabs[0].id, method: "on_user_popup_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); };
+
+    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 || "";
+    });
+  });
+};
+

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-19 16:49:41 +0000
+++ debian/changelog	2016-05-11 04:47:43 +0000
@@ -1,3 +1,10 @@
+unity-chromium-extension (3.2.1+15.04.20150119-0ubuntu1) vivid; urgency=medium
+
+  * Fixes: 1469601, by changing the notification method to use the pageAction
+    facility for display.
+
+ -- Justin McPherson <[e-mail]>  Tue, 30 Jun 2015 13:18:59 +1000
+
 unity-chromium-extension (3.2.0+15.04.20150119-0ubuntu1) vivid; urgency=medium
 
   [ Justin McPherson ]

=== modified file 'debian/control'
--- debian/control	2014-12-17 14:18:53 +0000
+++ debian/control	2016-05-11 04:47:43 +0000
@@ -1,7 +1,7 @@
 Source: unity-chromium-extension
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
-Build-Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2),
+Build-Depends: chromium-browser (>= 42.0.2311.90-0ubuntu1),
                debhelper (>= 9),
                dh-autoreconf,
                libglib2.0-dev,

=== modified file 'messaging-host/main.cpp'
--- messaging-host/main.cpp	2014-06-20 06:16:48 +0000
+++ messaging-host/main.cpp	2016-05-11 04:47:43 +0000
@@ -36,6 +36,11 @@
     case QtDebugMsg:
         syslog_type |= LOG_DEBUG;
         break;
+#if QT_VERSION >= 0x050500
+    case QtInfoMsg:
+        syslog_type |= LOG_INFO;
+        break;
+#endif
     case QtWarningMsg:
         syslog_type |= LOG_WARNING;
         break;