Merge lp://qastaging/~webapps/unity-chromium-extension/staging2 into lp://qastaging/unity-chromium-extension

Proposed by David Barth
Status: Merged
Approved by: David Barth
Approved revision: 265
Merged at revision: 248
Proposed branch: lp://qastaging/~webapps/unity-chromium-extension/staging2
Merge into: lp://qastaging/unity-chromium-extension
Diff against target: 25664 lines (+2599/-21107)
227 files modified
.bzrignore (+22/-1)
INSTALL (+0/-370)
Makefile.am (+0/-9)
Makefile.am.coverage (+0/-32)
README (+0/-1)
autogen.sh (+0/-157)
chromium-extension/Makefile.am (+0/-44)
chromium-extension/background-page.html (+0/-15)
chromium-extension/background-page.js (+251/-432)
chromium-extension/base-content-script.js (+1/-1)
chromium-extension/browser.js (+0/-154)
chromium-extension/chromium-extension.pro (+66/-0)
chromium-extension/infobar.js (+22/-18)
chromium-extension/manifest.json.in (+31/-41)
chromium-extension/unity-api-page-proxy-builder-gen.js (+0/-384)
chromium-extension/unity-api-page-proxy.js (+0/-146)
chromium-extension/unity-webapps.json.in (+2/-2)
chromium-extension/unity_api_page_proxy_generator.py (+0/-96)
common-project-config.pri (+41/-0)
common-vars.pri (+6/-0)
configure.ac (+0/-62)
coverage.pri (+49/-0)
debian/changelog (+10/-0)
debian/compat (+1/-1)
debian/control (+6/-10)
debian/copyright (+0/-45)
debian/rules (+6/-8)
debian/unity-chromium-extension.install (+4/-0)
m4/gcov.m4 (+0/-79)
messaging-host/Makefile.am (+2/-0)
messaging-host/com.canonical.webapp.installer.json.in (+9/-0)
messaging-host/connection.cpp (+152/-0)
messaging-host/connection.h (+52/-0)
messaging-host/inactivity-timer.cpp (+65/-0)
messaging-host/inactivity-timer.h (+56/-0)
messaging-host/main.cpp (+91/-0)
messaging-host/messaging-host.pro (+42/-0)
messaging-host/service.cpp (+120/-0)
messaging-host/service.h (+56/-0)
messaging-host/webapps-handler.cpp (+324/-0)
messaging-host/webapps-handler.h (+59/-0)
messaging-host/webapps-process.cpp (+28/-0)
messaging-host/webapps-process.h (+37/-0)
npapi-binding-gen/bindinggen.py (+0/-203)
npapi-binding-gen/common_gen.py (+0/-9)
npapi-binding-gen/get_functions_to_generate.sh (+0/-5)
npapi-binding-gen/header_generator.py (+0/-23)
npapi-binding-gen/header_generator_test.py (+0/-18)
npapi-binding-gen/headers.py (+0/-25)
npapi-binding-gen/npapi_meta.py (+0/-104)
npapi-binding-gen/parser.py (+0/-168)
npapi-binding-gen/parser_test.py (+0/-25)
npapi-binding-gen/prepasses.py (+0/-42)
npapi-binding-gen/prepasses_test.py (+0/-13)
npapi-binding-gen/source_generator.py (+0/-213)
npapi-binding-gen/sources_gen_test.py (+0/-25)
npapi-binding-gen/tests/data/header-gen-data-1 (+0/-135)
npapi-binding-gen/tests/data/parser-data-1 (+0/-135)
npapi-binding-gen/tests/data/parser-data-1.result (+0/-50)
npapi-binding-gen/tests/data/pre-pass-cleanup-data-1 (+0/-62)
npapi-binding-gen/tests/data/pre-pass-cleanup-data-1.result (+0/-44)
npapi-binding-gen/tests/data/pre-pass-cleanup-data-2 (+0/-176)
npapi-binding-gen/tests/data/pre-pass-cleanup-data-2.result (+0/-143)
npapi-binding-gen/tests/data/source-gen-data-1 (+0/-135)
npapi-binding-gen/unittest_gen.py (+0/-126)
npapi-plugin/Makefile.am (+0/-7)
npapi-plugin/src/Makefile.am (+0/-68)
npapi-plugin/src/libunity_npapi_plugin-0.1.pc.in (+0/-13)
npapi-plugin/src/notify-binding.c (+0/-222)
npapi-plugin/src/notify-binding.h (+0/-36)
npapi-plugin/src/npapi-headers/headers/npapi.h (+0/-895)
npapi-plugin/src/npapi-headers/headers/npfunctions.h (+0/-322)
npapi-plugin/src/npapi-headers/headers/npruntime.h (+0/-393)
npapi-plugin/src/npapi-headers/headers/nptypes.h (+0/-121)
npapi-plugin/src/unity-npapi-binding-utils.c (+0/-81)
npapi-plugin/src/unity-npapi-binding-utils.h (+0/-76)
npapi-plugin/src/unity-npapi-common.h (+0/-61)
npapi-plugin/src/unity-npapi-debug.h (+0/-36)
npapi-plugin/src/unity-npapi-plugin-entry-funcs.c (+0/-118)
npapi-plugin/src/unity-npapi-plugin-entry-funcs.h (+0/-41)
npapi-plugin/src/unity-npapi-plugin-npn-funcs.c (+0/-426)
npapi-plugin/src/unity-npapi-plugin-npn-funcs.h (+0/-32)
npapi-plugin/src/unity-npapi-plugin-pp-funcs.c (+0/-283)
npapi-plugin/src/unity-npapi-plugin-pp-funcs.h (+0/-81)
npapi-plugin/src/unity-npapi-plugin.c (+0/-188)
npapi-plugin/src/unity-npapi-plugin.h (+0/-72)
npapi-plugin/src/unity-npapi-tools.c (+0/-97)
npapi-plugin/src/unity-npapi-tools.h (+0/-30)
npapi-plugin/src/unity-webapps-base-js-object.c (+0/-564)
npapi-plugin/src/unity-webapps-base-js-object.h (+0/-84)
npapi-plugin/src/unity-webapps-binding-dispatcher.c (+0/-368)
npapi-plugin/src/unity-webapps-binding-dispatcher.h (+0/-47)
npapi-plugin/src/unity-webapps-binding-test.c (+0/-27)
npapi-plugin/src/unity-webapps-binding-test.h (+0/-11)
npapi-plugin/src/unity-webapps-binding.c (+0/-3127)
npapi-plugin/src/unity-webapps-binding.h (+0/-424)
npapi-plugin/src/unity-webapps-repository-binding.c (+0/-541)
npapi-plugin/src/unity-webapps-repository-binding.h (+0/-89)
npapi-plugin/src/unity-webapps-scriptable-object.c (+0/-91)
npapi-plugin/src/unity-webapps-scriptable-object.h (+0/-46)
npapi-plugin/src/wrapped-callback-type.c (+0/-174)
npapi-plugin/src/wrapped-callback-type.h (+0/-53)
npapi-plugin/src/wrapped-ptr-type.c (+0/-215)
npapi-plugin/src/wrapped-ptr-type.h (+0/-45)
tests/Makefile.am (+0/-1)
tests/functional/npapi/context_new_lazy_test/background-page.html (+0/-72)
tests/functional/npapi/context_new_lazy_test/manifest.json (+0/-21)
tests/functional/npapi/driver.py (+0/-32)
tests/tests.pro (+3/-0)
tests/unit/Makefile.am (+0/-1)
tests/unit/messaging-host/connection-host.cpp (+71/-0)
tests/unit/messaging-host/messaging-host.pri (+9/-0)
tests/unit/messaging-host/messaging-host.pro (+12/-0)
tests/unit/messaging-host/tst_connection.cpp (+112/-0)
tests/unit/messaging-host/tst_connection.pro (+14/-0)
tests/unit/messaging-host/tst_connection_host.pro (+14/-0)
tests/unit/messaging-host/tst_inactivity_timer.cpp (+125/-0)
tests/unit/messaging-host/tst_inactivity_timer.pro (+18/-0)
tests/unit/messaging-host/tst_service.cpp (+189/-0)
tests/unit/messaging-host/tst_service.pro (+18/-0)
tests/unit/messaging-host/tst_webapps-handler.cpp (+354/-0)
tests/unit/messaging-host/tst_webapps-handler.pro (+32/-0)
tests/unit/npapi/Makefile.am (+0/-528)
tests/unit/npapi/context-add-application-actions-test.c (+0/-149)
tests/unit/npapi/context-add-application-actions-test.h (+0/-6)
tests/unit/npapi/context-add-icon-test.c (+0/-149)
tests/unit/npapi/context-add-icon-test.h (+0/-6)
tests/unit/npapi/context-destroy-test.c (+0/-116)
tests/unit/npapi/context-destroy-test.h (+0/-6)
tests/unit/npapi/context-get-domain-test.c (+0/-102)
tests/unit/npapi/context-get-domain-test.h (+0/-6)
tests/unit/npapi/context-get-interest-id-test.c (+0/-102)
tests/unit/npapi/context-get-interest-id-test.h (+0/-6)
tests/unit/npapi/context-get-name-test.c (+0/-102)
tests/unit/npapi/context-get-name-test.h (+0/-6)
tests/unit/npapi/context-new-lazy-test.c (+0/-175)
tests/unit/npapi/context-new-lazy-test.h (+0/-6)
tests/unit/npapi/context-on-close-callback-test.c (+0/-149)
tests/unit/npapi/context-on-close-callback-test.h (+0/-6)
tests/unit/npapi/context-on-raise-callback-test.c (+0/-149)
tests/unit/npapi/context-on-raise-callback-test.h (+0/-6)
tests/unit/npapi/context-prepare-test.c (+0/-149)
tests/unit/npapi/context-prepare-test.h (+0/-6)
tests/unit/npapi/context-remove-application-action-test.c (+0/-125)
tests/unit/npapi/context-remove-application-action-test.h (+0/-6)
tests/unit/npapi/context-remove-application-actions-test.c (+0/-102)
tests/unit/npapi/context-remove-application-actions-test.h (+0/-6)
tests/unit/npapi/context-set-homepage-test.c (+0/-125)
tests/unit/npapi/context-set-homepage-test.h (+0/-6)
tests/unit/npapi/context-set-preview-requested-callback-test.c (+0/-149)
tests/unit/npapi/context-set-preview-requested-callback-test.h (+0/-6)
tests/unit/npapi/context-set-view-is-active-test.c (+0/-125)
tests/unit/npapi/context-set-view-is-active-test.h (+0/-6)
tests/unit/npapi/context-set-view-location-test.c (+0/-125)
tests/unit/npapi/context-set-view-location-test.h (+0/-6)
tests/unit/npapi/indicator-add-action-test.c (+0/-174)
tests/unit/npapi/indicator-add-action-test.h (+0/-6)
tests/unit/npapi/indicator-clear-indicator-test.c (+0/-125)
tests/unit/npapi/indicator-clear-indicator-test.h (+0/-6)
tests/unit/npapi/indicator-clear-indicators-test.c (+0/-102)
tests/unit/npapi/indicator-clear-indicators-test.h (+0/-6)
tests/unit/npapi/indicator-set-callback-test.c (+0/-174)
tests/unit/npapi/indicator-set-callback-test.h (+0/-6)
tests/unit/npapi/indicator-set-property-icon-test.c (+0/-174)
tests/unit/npapi/indicator-set-property-icon-test.h (+0/-6)
tests/unit/npapi/indicator-set-property-test.c (+0/-174)
tests/unit/npapi/indicator-set-property-test.h (+0/-6)
tests/unit/npapi/indicator-show-indicator-test.c (+0/-125)
tests/unit/npapi/indicator-show-indicator-test.h (+0/-6)
tests/unit/npapi/launcher-add-action-test.c (+0/-174)
tests/unit/npapi/launcher-add-action-test.h (+0/-6)
tests/unit/npapi/launcher-add-static-action-test.c (+0/-149)
tests/unit/npapi/launcher-add-static-action-test.h (+0/-6)
tests/unit/npapi/launcher-clear-count-test.c (+0/-102)
tests/unit/npapi/launcher-clear-count-test.h (+0/-6)
tests/unit/npapi/launcher-clear-progress-test.c (+0/-102)
tests/unit/npapi/launcher-clear-progress-test.h (+0/-6)
tests/unit/npapi/launcher-remove-action-test.c (+0/-125)
tests/unit/npapi/launcher-remove-action-test.h (+0/-6)
tests/unit/npapi/launcher-remove-actions-test.c (+0/-102)
tests/unit/npapi/launcher-remove-actions-test.h (+0/-6)
tests/unit/npapi/launcher-remove-static-actions-test.c (+0/-102)
tests/unit/npapi/launcher-remove-static-actions-test.h (+0/-6)
tests/unit/npapi/launcher-set-count-test.c (+0/-125)
tests/unit/npapi/launcher-set-count-test.h (+0/-6)
tests/unit/npapi/launcher-set-progress-test.c (+0/-125)
tests/unit/npapi/launcher-set-progress-test.h (+0/-6)
tests/unit/npapi/launcher-set-urgent-test.c (+0/-102)
tests/unit/npapi/launcher-set-urgent-test.h (+0/-6)
tests/unit/npapi/music-player-get-can-go-next-test.c (+0/-102)
tests/unit/npapi/music-player-get-can-go-next-test.h (+0/-6)
tests/unit/npapi/music-player-get-can-go-previous-test.c (+0/-102)
tests/unit/npapi/music-player-get-can-go-previous-test.h (+0/-6)
tests/unit/npapi/music-player-get-can-pause-test.c (+0/-102)
tests/unit/npapi/music-player-get-can-pause-test.h (+0/-6)
tests/unit/npapi/music-player-get-can-play-test.c (+0/-102)
tests/unit/npapi/music-player-get-can-play-test.h (+0/-6)
tests/unit/npapi/music-player-get-playback-state-test.c (+0/-102)
tests/unit/npapi/music-player-get-playback-state-test.h (+0/-6)
tests/unit/npapi/music-player-init-test.c (+0/-125)
tests/unit/npapi/music-player-init-test.h (+0/-6)
tests/unit/npapi/music-player-on-next-callback-test.c (+0/-149)
tests/unit/npapi/music-player-on-next-callback-test.h (+0/-6)
tests/unit/npapi/music-player-on-play-pause-callback-test.c (+0/-149)
tests/unit/npapi/music-player-on-play-pause-callback-test.h (+0/-6)
tests/unit/npapi/music-player-on-previous-callback-test.c (+0/-149)
tests/unit/npapi/music-player-on-previous-callback-test.h (+0/-6)
tests/unit/npapi/music-player-set-can-go-next-test.c (+0/-125)
tests/unit/npapi/music-player-set-can-go-next-test.h (+0/-6)
tests/unit/npapi/music-player-set-can-go-previous-test.c (+0/-125)
tests/unit/npapi/music-player-set-can-go-previous-test.h (+0/-6)
tests/unit/npapi/music-player-set-can-pause-test.c (+0/-125)
tests/unit/npapi/music-player-set-can-pause-test.h (+0/-6)
tests/unit/npapi/music-player-set-can-play-test.c (+0/-125)
tests/unit/npapi/music-player-set-can-play-test.h (+0/-6)
tests/unit/npapi/music-player-set-playback-state-test.c (+0/-125)
tests/unit/npapi/music-player-set-playback-state-test.h (+0/-6)
tests/unit/npapi/music-player-set-track-test.c (+0/-200)
tests/unit/npapi/music-player-set-track-test.h (+0/-6)
tests/unit/npapi/notification-show-notification-test.c (+0/-174)
tests/unit/npapi/notification-show-notification-test.h (+0/-6)
tests/unit/npapi/permissions-is-integration-allowed-test.c (+0/-80)
tests/unit/npapi/permissions-is-integration-allowed-test.h (+0/-6)
tests/unit/npapi/test_common.c (+0/-27)
tests/unit/npapi/test_common.h (+0/-23)
tests/unit/unit.pro (+3/-0)
unity-chromium-extension.pro (+14/-0)
To merge this branch: bzr merge lp://qastaging/~webapps/unity-chromium-extension/staging2
Reviewer Review Type Date Requested Status
WebApps Pending
Review via email: mp+244966@code.qastaging.launchpad.net

Commit message

Support native messaging (Justin McPherson, Alberto Mardegan)

Description of the change

Support native messaging (Justin McPherson, Alberto Mardegan)

To post a comment you must log in.
266. By David Barth

sync with latest upstream (vivid) debian changelog

267. By David Barth

add libtool dependency

268. By David Barth

revert

269. By David Barth

reset to UNRELEASED for the ci bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: