Merge lp://qastaging/~justinmcp/unity-chromium-extension/generic-extension into lp://qastaging/unity-chromium-extension

CMakeLists.txt (+32/-0)
chromium-extension/CMakeLists.txt (+69/-0)
chromium-extension/background-page.html (+2/-2)
chromium-extension/background-page.js (+64/-61)
chromium-extension/browser.js (+24/-24)
chromium-extension/build.sh (+0/-27)
chromium-extension/chromium-extension.pro (+0/-66)
chromium-extension/infobar.css (+0/-20)
chromium-extension/infobar.html (+0/-20)
chromium-extension/infobar.js (+0/-33)
chromium-extension/manifest.json.in (+41/-35)
chromium-extension/options.html (+4/-6)
chromium-extension/options.js (+3/-3)
chromium-extension/popup.css (+21/-0)
chromium-extension/popup.html (+20/-0)
chromium-extension/popup.js (+36/-0)
chromium-extension/unity-api-page-proxy.js (+1/-1)
chromium-extension/unity-webapps.json.in (+2/-2)
common-project-config.pri (+0/-41)
common-vars.pri (+0/-6)
coverage.pri (+0/-49)
debian/changelog (+7/-0)
debian/control (+13/-5)
debian/unity-chromium-extension.install (+2/-3)
debian/unity-webapps-extension-process.install (+1/-0)
messaging-host/CMakeLists.txt (+101/-0)
messaging-host/Makefile.am (+0/-2)
messaging-host/click-handler.cpp (+386/-0)
messaging-host/click-handler.h (+55/-0)
messaging-host/com.canonical.webapp.extension.json.in (+9/-0)
messaging-host/com.canonical.webapp.installer.json.in (+0/-9)
messaging-host/main.cpp (+28/-8)
messaging-host/messaging-host.pro (+0/-42)
messaging-host/service-handler.cpp (+75/-0)
messaging-host/service-handler.h (+54/-0)
messaging-host/service.cpp (+18/-11)
messaging-host/webapps-handler.cpp (+11/-17)
messaging-host/webapps-handler.h (+0/-1)
tests/CMakeLists.txt (+1/-0)
tests/tests.pro (+0/-3)
tests/unit/CMakeLists.txt (+1/-0)
tests/unit/messaging-host/CMakeLists.txt (+5/-0)
tests/unit/messaging-host/click-handler/CMakeLists.txt (+38/-0)
tests/unit/messaging-host/click-handler/tst_click-handler.cpp (+291/-0)
tests/unit/messaging-host/connection-host.cpp (+0/-71)
tests/unit/messaging-host/connection/CMakeLists.txt (+40/-0)
tests/unit/messaging-host/connection/connection-host.cpp (+71/-0)
tests/unit/messaging-host/connection/tst_connection.cpp (+112/-0)
tests/unit/messaging-host/inactivity-timer/CMakeLists.txt (+23/-0)
tests/unit/messaging-host/inactivity-timer/tst_inactivity_timer.cpp (+125/-0)
tests/unit/messaging-host/messaging-host.pri (+0/-9)
tests/unit/messaging-host/messaging-host.pro (+0/-12)
tests/unit/messaging-host/service/CMakeLists.txt (+23/-0)
tests/unit/messaging-host/service/tst_service.cpp (+189/-0)
tests/unit/messaging-host/tst_connection.cpp (+0/-112)
tests/unit/messaging-host/tst_connection.pro (+0/-14)
tests/unit/messaging-host/tst_connection_host.pro (+0/-14)
tests/unit/messaging-host/tst_inactivity_timer.cpp (+0/-125)
tests/unit/messaging-host/tst_inactivity_timer.pro (+0/-18)
tests/unit/messaging-host/tst_service.cpp (+0/-189)
tests/unit/messaging-host/tst_service.pro (+0/-18)
tests/unit/messaging-host/tst_webapps-handler.cpp (+0/-354)
tests/unit/messaging-host/tst_webapps-handler.pro (+0/-32)
tests/unit/messaging-host/webapps-handler/CMakeLists.txt (+47/-0)
tests/unit/messaging-host/webapps-handler/tst_webapps-handler.cpp (+354/-0)
tests/unit/unit.pro (+0/-3)
unity-chromium-extension.pro (+0/-14)