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

[David Barth]

Support native messaging (Justin McPherson, Alberto Mardegan)

Support native messaging (Justin McPherson, Alberto Mardegan)

[lp:~webapps/unity-chromium-extension/staging2]

266. By David Barth on 2014-12-17

sync with latest upstream (vivid) debian changelog

267. By David Barth on 2014-12-17

add libtool dependency

268. By David Barth on 2014-12-17

revert

269. By David Barth on 2015-01-19

reset to UNRELEASED for the ci bot

=== modified file '.bzrignore'
--- .bzrignore	2012-03-16 12:42:18 +0000
+++ .bzrignore	2015-01-19 16:40:00 +0000
@@ -1,2 +1,23 @@
+*.log
+*.moc
+*.substvars
 Makefile
-Makefile.in
+Makefile.*
+moc_*.cpp
+/chromium-extension/build/
+/chromium-extension/buildstamp
+/chromium-extension/manifest.json
+/chromium-extension/res/
+/chromium-extension/unity-webapps/
+/chromium-extension/unity-webapps.crx
+/chromium-extension/unity-webapps.json
+/chromium-extension/unity-webapps.pem
+/debian/files
+/debian/tmp
+/debian/unity-chromium-extension/
+/messaging-host/com.canonical.webapp.installer.json
+/messaging-host/unity-webapps-messaging-host
+/tests/unit/messaging-host/connection-host
+/tests/unit/messaging-host/tst_connection
+/tests/unit/messaging-host/tst_inactivity_timer
+/tests/unit/messaging-host/tst_service

=== removed file 'AUTHORS'
=== removed file 'ChangeLog'
=== removed file 'INSTALL'
--- INSTALL	2012-06-02 00:56:28 +0000
+++ INSTALL	1970-01-01 00:00:00 +0000
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

=== removed file 'Makefile.am'
--- Makefile.am	2012-10-01 23:03:21 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-SUBDIRS = npapi-plugin chromium-extension tests po
-
-CLEANFILES = unity-webapps.pem
-
-DISTCHECK_CONFIGURE_FLAGS=--enable-tests=yes
-
-EXTRA_DIST = autogen.sh
-
-include $(top_srcdir)/Makefile.am.coverage

=== removed file 'Makefile.am.coverage'
--- Makefile.am.coverage	2012-11-29 17:44:47 +0000
+++ Makefile.am.coverage	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-
-# Coverage targets
-
-if HAVE_GCOV
-
-.PHONY: clean-gcda
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-
-.PHONY: coverage-html generate-coverage-html clean-coverage-html
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-
-coverage-xml: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	gcovr --xml -r $(top_builddir) -o "$(top_builddir)/coverage.xml" --exclude='.*tests.*'
-
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	$(LCOV) --extract coverage.info "`pwd`/npapi-plugin/src/*" --output-file coverage-src.info
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coverage-html --title "Code Coverage" --legend --show-details coverage-src.info
-
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coverage-src.info coverage-html
-
-clean-local: clean-coverage-html
-
-endif # HAVE_GCOV

=== removed file 'NEWS'
=== removed file 'README'
--- README	2012-11-14 20:26:07 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-+
\ No newline at end of file

=== removed file 'autogen.sh'
--- autogen.sh	2012-03-08 15:11:24 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
-	ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-	LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
-	PATH="$GNOME2_DIR/bin:$PATH"
-	export PATH
-	export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`intltool' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
-  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`xml-i18n-toolize' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^LT_INIT" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
-  (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
-  (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`glib' installed."
-    echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    ( cd $dr
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running glib-gettextize...  Ignore non-fatal messages."
-	echo "no" | glib-gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
-        echo "Running intltoolize..."
-	intltoolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
-        echo "Running xml-i18n-toolize..."
-	xml-i18n-toolize --copy --force --automake
-      fi
-      if grep "^LT_INIT" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^A[CM]_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure "$@" ...
-  $srcdir/configure "$@" \
-  && echo Now type \`make\' to compile. || exit 1
-else
-  echo Skipping configure process.
-fi

=== removed file 'chromium-extension/Makefile.am'
--- chromium-extension/Makefile.am	2013-12-16 07:15:32 +0000
+++ chromium-extension/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-CLEANFILES = res/*
-EXTRA_DIST =
-
-extensiondir = $(libdir)/libunity-chromium
-extension_DATA=res/unity-webapps.crx
-
-
-clean-extension-package:
-	rm -f $(CLEANFILES)
-
-SCRIPT_FILES = \
-	$(shell ls *.css) \
-	$(shell ls *.html) \
-	$(shell ls *.js) \
-	$(shell ls skin/*) \
-	$(shell ls _locales/*/*) 
-
-res/unity-webapps.crx: $(SCRIPT_FILES) unity-webapps.json manifest.json
-	cp -f $(top_builddir)/npapi-plugin/src/.libs/libunity_npapi_plugin.so .
-	if [ ! -f ../unity-webapps.pem ]; \
-	then \
-		openssl genrsa 1024 > ../unity-webapps.pem; \
-	fi
-	$(srcdir)/crxmake.sh $(abs_builddir) ../unity-webapps.pem
-	mv res/chromium-extension.crx res/unity-webapps.crx
-
-manifestdir = $(datadir)/chromium/extensions/
-manifest_DATA = $(shell ls $(top_builddir)/chromium-extension/res/*.json)
-
-%.json: %.json.in
-	sed -e "s|\@EXTDIR\@|$(extensiondir)/unity-webapps.crx|" $< | sed -e "s|\@VERSION\@|$(VERSION)|"> $@
-
-
-CLEANFILES += \
-	unity-webapps.json \
-	manifest.json \
-	libunity_npapi_plugin.so \
-	chromium-extension.crx
-
-EXTRA_DIST += \
-	unity-webapps.json.in \
-	manifest.json.in \
-	crxmake.sh \
-	$(SCRIPT_FILES)

=== added file 'chromium-extension/background-page.html'
--- chromium-extension/background-page.html	1970-01-01 00:00:00 +0000
+++ chromium-extension/background-page.html	2015-01-19 16:40:00 +0000
@@ -0,0 +1,15 @@
+<!doctype html>
+<html>
+    <head>
+
+    <title>Unity Webapps Extension Background Page</title>
+    <embed type="application/x-unity-webapps-npapi" id="unityChromiumExtensionId"/>
+    
+    <script src="background-page.js"></script>
+    
+    </head>
+
+    <body>
+    </body>
+
+</html>

=== removed file 'chromium-extension/background-page.html'
--- chromium-extension/background-page.html	2012-11-09 17:28:56 +0000
+++ chromium-extension/background-page.html	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-
-    <title>Unity Webapps Extension Background Page</title>
-    <embed type="application/x-unity-webapps-npapi" id="unityChromiumExtensionId"/>
-    
-    <script src="background-page.js"></script>
-    
-    </head>
-
-    <body>
-    </body>
-
-</html>

=== modified file 'chromium-extension/background-page.js'
--- chromium-extension/background-page.js	2014-02-20 00:33:36 +0000
+++ chromium-extension/background-page.js	2015-01-19 16:40:00 +0000
@@ -6,7 +6,7 @@
  *   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 
+ *   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.
@@ -16,440 +16,259 @@
  **/
 
 var background_page = (function () {
-
-   // TODO extract based on logging settings
-   var log = {
-     info: function (msg) {
-       if (msg) {
-	 console.log ('Info: ' + msg);
-       }
-     }
-     ,
-     error: function (msg) {
-       if (msg) {
-	 console.log ('Error: ' + msg);
-       }
-     }
-   };
-
-   // connection & init w/ plugin NPAPI layer
-   var plugin = document.getElementById ('unityChromiumExtensionId');
-   if ( ! plugin) {
-     log.error ("Unable to retrieve the Unity Chromium plugin");
-     return null;
-   }
-   var service = plugin.service_new ();
-   if (! service) {
-     log.error ("Unable to retrieve a connection to Unity Webapps service");
-     return null;
-   }
-
-
-   /////////////////////////////////////////////////////////
-   // 
-   // Handle login & connection to online-accounts project's
-   // extension
-   // 
-   ////////////////////////////////////////////////////////
-   var loginListeners = [];
-   var onLoginListenerRequest = function (request, sender, sendResponse) {
-     if (request.action == "registerLoginListener") {
-       log.info ("Login listener request from " + sender.id);
-       loginListeners.push (sender.id);
-     }
-   };
-   chrome.runtime.onMessageExternal.addListener (onLoginListenerRequest);
-
-   var onLoginEvent = function (request, sender, sendResponse) {
-     if (request.action == "loginEvent") {
-       log.info ("Login on " + request.domain + ": " + request.login);
-       var len = loginListeners.length;
-       for (var i = 0; i < len; i++) {
-         var extensionId = loginListeners[i];
-         log.info("Notifying login listener: " + extensionId);
-         chrome.runtime.sendMessage (extensionId, {
-                                         type: "login",
-                                         login: request.login,
-                                         domain: request.domain
-                                       });
-       }
-     }
-   };
-   chrome.runtime.onMessage.addListener (onLoginEvent);
-
-
-   /////////////////////////////////////////////////////////
-   // 
-   // Scafolding to keep track of data associated w/ infobar requests 
-   // (Chromium's structure imposes some kind of state being maintained
-   // 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] = {callback: callback
-						         , message: message
-                                                         , details: details
-						        };
-   };
-   var getDataIfAnyFor = function (infobarRequestId) {
-     if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
-       return "";
-     }
-     return { message: user_infobar_request_callbacks[infobarRequestId].message,
-              details: user_infobar_request_callbacks[infobarRequestId].details };
-   };
-   var invokeAndRemoveCallbackIfAnyFor = function (infobarRequestId, arguments) {
-     if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
-       return;
-     }
-     var callback = user_infobar_request_callbacks[infobarRequestId].callback;
-     user_infobar_request_callbacks[infobarRequestId] = undefined;
-     if (typeof(callback) === 'function') {
-       callback(arguments);
-     }
-   };
-
-
-   /////////////////////////////////////////////////////////
-   // 
-   // Extract installed userscripts & webapps info
-   // 
-   ////////////////////////////////////////////////////////
-   var initializeIntegrationScriptRepositoryAccess = function (plugin) {
-
-     var repo = plugin.application_repository_new_default ();
-     plugin.application_repository_prepare (repo);
-     return repo;
-   };
-   var repo_ = initializeIntegrationScriptRepositoryAccess(plugin);
-   var repo_install_request_stamps = {};
-
-   /**
-    * Performs a match on the list of loaded integration scripts
-    * given a url.
-    *
-    */
-   var matchesIntegrationScripts = function (plugin, url, repo, windowInfos, callback) {
-     function askForApplicationInstallation(plugin, appPackageName, appDomain, url, installationCallback) {
-
-       if (plugin.permissions_get_domain_dontask(appDomain)) {
-         log.info ("WebApp domain was found in the 'dont ask' list, won't install: " + appPackageName);
-         installationCallback ();
-         return;
-       }
-       if (repo_install_request_stamps[appPackageName] !== undefined) {
-         log.info ('WebApp not being considered for install (request is only issues once per session): ' + appPackageName);
-         installationCallback ();
-         return;
-       }
-       repo_install_request_stamps[appPackageName] = true;
-
-       function installApp() {
-         log.info ('Installing application: ' + appPackageName);
-         plugin.permissions_allow_domain(appDomain);
-         plugin.application_repository_install_application(repo, appPackageName, installationCallback, null);
-       }
-       function addToIgnoreList() {
-         plugin.permissions_dontask_domain(appDomain);
-       }
-       var isInstallationConfirmed = function (response) {
-	  return response && response.integrate;
-       };
-
-       if (!plugin.permissions_get_domain_preauthorized(appDomain)) {
-         var appName = plugin.application_repository_get_resolved_application_name(repo, appPackageName);
-         addInfobarRequestCallbackFor (windowInfos.tabId,
-                                       function (result) {
-                                         log.info ('Asking for installation : ' + windowInfos.tabId);
-                                         if (result === undefined) {
-                                           installationCallback();
-                                         }
-                                         if (isInstallationConfirmed(result))
-                                           installApp();
-                                         else
-                                           addToIgnoreList();
-                                       },
-	                               chrome.i18n.getMessage("integration_copy", [appName, appDomain]),
-                                       null);
-         chrome.infobars.show ({tabId: windowInfos.tabId, path: "infobar.html"});
-       }
-       else {
-         plugin.permissions_allow_domain(appDomain);
-         installApp();
-       }
-
-     } // function askForApplicationInstallation
-
-     var APPLICATION_STATUS_AVAILABLE = 0;
-     var APPLICATION_STATUS_INSTALLED = 1;
-     var APPLICATION_STATUS_UNRESOLVED = 2;
-
-     var formatMatchedWebAppInfo = function (packageName, appName, appDomain, src) {
-       return {
-         packageName: packageName,
-         appName: appName,
-         appDomain: appDomain,
-         content: src,
-         requires: null,
-         includes: null
-       };
-     };
-
-     /**
-      * Gathers the lists of installed and (if any) available apps for a given list of app names
-      * (available for a given url).
-      * 
-      * @returns object with "installed" and "available" list properties
-      */
-     var gatherApplicationsStatuses = function (packageNames) {
-       var installed = [];
-       var available = [];
-       for (var i = 0; i < packageNames.length; ++i) {
-         var packageName = packageNames[i];
-
-         var status = plugin.application_repository_get_resolved_application_status (repo, packageName);
-         var appName = plugin.application_repository_get_resolved_application_name (repo, packageName);
-         var appDomain = plugin.application_repository_get_resolved_application_domain (repo, packageName);
-
-         log.info ('A WebApp application has been found: ' + appName + ', status: ' + status);
-
-         switch (status) {
-           case APPLICATION_STATUS_INSTALLED:
-             // we have found an installed application, use it directly
-             var src = plugin.application_repository_get_userscript_contents (repo, packageName);
-             installed.push (formatMatchedWebAppInfo(packageName, appName, appDomain, src));
-             break;
-           case APPLICATION_STATUS_AVAILABLE:
-             // we have found an application that can apply and be installed
-             available.push (formatMatchedWebAppInfo(packageName, appName, appDomain));
-             break;
-         }
-       }
-       return {
-         installed: installed,
-         available: available
-       };
-     };
-
-     var packageNames = JSON.parse(plugin.application_repository_resolve_url_as_json(repo_, url));
-     if (null != packageNames) {
-       var appStatuses = gatherApplicationsStatuses(packageNames);
-
-       if (appStatuses && appStatuses.installed && appStatuses.installed.length > 0) {
-         var app = appStatuses.installed[0];
-         if (repo_install_request_stamps[app.packageName] == undefined
-             && ! plugin.permissions_get_domain_dontask(app.appDomain)
-             && ! plugin.permissions_get_domain_allowed(app.appDomain)) {
-           // requesting for install
-           addInfobarRequestCallbackFor (windowInfos.tabId,
-                                         function (result) {
-                                           if (result && result.integrate) {
-                                             plugin.application_repository_add_desktop_to_launcher(app.appName, app.appDomain);
-                                             plugin.permissions_allow_domain(app.appDomain);
-                                           }
-                                           else {
-                                             plugin.permissions_dontask_domain(app.appDomain);
-                                           }
-                                         },
-	                                 chrome.i18n.getMessage("integration_copy", [app.appName, app.appDomain]),
-                                         null);
-           chrome.infobars.show ({tabId: windowInfos.tabId, path: "infobar.html"});
-         }
-         return;
-       }
-
-       // we should have at most one script for a given app
-       if (appStatuses && appStatuses.available && appStatuses.available.length > 0) {
-         var app = appStatuses.available[0];
-         askForApplicationInstallation (plugin,
-                                        app.packageName,
-                                        app.appDomain,
-                                        url,
-                                        function (_repository, name, status, data) {
-                                          log.info ('Application installed: ' + name + ', (status ' + status + ')');
-
-                                          if (name !== undefined && status == APPLICATION_STATUS_INSTALLED) {
-                                            callback (true, app.packageName, app.appName, app.appDomain);
-                                          }
-                                        }
-                                       );
-       }
-       else
-         callback (false);
-     } // if (null != names) {
-
-   }; // var matchesIntegrationScripts = function (plugin, url, repo, windowInfos, callback) {
-   
-   
-   ////////////////////////////////////////
-   // 
-   // main request handler
-   // 
-   ///////////////////////////////////////
+    // Native messaging support
+    var HOST_ADDRESS = 'com.canonical.webapp.installer';
+    var port = null;
+    var host_callbacks = [];
+
+    var portListener = function (msg) {
+        callback = host_callbacks.pop();  
+        if (callback === undefined) {
+            return;
+        }
+        callback(msg);
+    };
+
+    var portDisconnecter = function () {
+        console.log('UCX: port disconnected');
+        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);
+            port.onDisconnect.addListener(portDisconnecter);
+        }
+        host_callbacks.push(callback || function(m) {});
+        port.postMessage(msg);
+    };
+
+    // Wake server to catalogue webapps
+    sendNativeMessage({"method":"ping"});
+
+
+    /////////////////////////////////////////////////////////
+    // 
+    // Scafolding to keep track of data associated w/ infobar requests 
+    // (Chromium's structure imposes some kind of state being maintained
+    // 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] = {
+            callback: callback,
+            message: message,
+            details: details
+        };
+    };
+
+    var getDataIfAnyFor = function (infobarRequestId) {
+        if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
+            return "";
+        }
+        return {
+            message: user_infobar_request_callbacks[infobarRequestId].message,
+            details: user_infobar_request_callbacks[infobarRequestId].details
+        };
+    };
+
+    var invokeAndRemoveCallbackIfAnyFor = function (infobarRequestId, arguments) {
+        if (user_infobar_request_callbacks[infobarRequestId] === undefined) {
+            return;
+        }
+        var callback = user_infobar_request_callbacks[infobarRequestId].callback;
+        user_infobar_request_callbacks[infobarRequestId] = undefined;
+        if (typeof(callback) === 'function') {
+            callback(arguments);
+        }
+    };
+
+
+    /**
+     * Performs a match on the list of loaded integration scripts
+     * given a url.
+     *
+     */
+    var matchesIntegrationScripts = function (plugin, url, repo, windowInfos, callback) {
+        sendNativeMessage({
+                "method" : "url_loaded",
+                "url" : url
+            },
+            function (response) {
+                if (response.available) {
+                    addInfobarRequestCallbackFor(
+                        windowInfos.tabId,
+                        function (result) {
+                            if (result && result.integrate) {
+                                sendNativeMessage({
+                                    "method" : "install",
+                                    "url" : url
+                                })
+                            } else {
+                                sendNativeMessage({
+                                    "method" : "dont_ask",
+                                    "url" : url
+                                })
+                            }
+                        },
+                        chrome.i18n.getMessage("integration_copy", [ response.appName, response.appDomain ]),
+                        null);
+
+                    chrome.infobars.show({ tabId: windowInfos.tabId, path: "infobar.html" });
+                }
+            });
+    }; 
+   
+   
+   // {{{ main request handler
    
    /**
     * Handles & responds to content script requests.
     * 
     */
-   var init_requested_stamps = {};
-   var contentScriptsRequestHandler = function (request, sender, callback) {
-     
-     var handlers = {
-       get_extension_settings: function (request, sender, callback) {
-	 
-	 var settings = {
-	   logging: false,
-           incognito: sender.tab.incognito
-	 };
-	 
-	 try {
-	   if (window.localStorage) {
-	     settings.logging = localStorage['logging'];
-	   }
-	 }
-	 catch (e) {
-	   log.error ("Error while trying to retrieve logging information: " + str(e));
-	 }
-	 
-	 callback (settings);
-       }
-       ,
-       on_user_infobar_request_result: function (request, sender, callback) {
-	 
-	 invokeAndRemoveCallbackIfAnyFor (request.tabId, request);
-       }
-       ,
-       init_requested: function (request, sender, callback) {
-         var name = request.options.name;
-         var domain = request.options.domain;
-         var iconUrl = request.options.iconUrl + '';
-         var homepage = request.options.homepage || request.options.url;
-
-         if (! domain || ! name || typeof(domain) !== 'string' || typeof(name) !== 'string')
-           return;
-
-         var islocal = request.options.protocol && request.options.protocol === 'file:';
-         var host = request.options.hostname || request.options.host;
-         if ( ! islocal && (! host || typeof(host) !== 'string'))
-           return;
-
-         if (-1 === homepage.indexOf(domain) || -1 === host.indexOf(domain)) {
-           log.error('Invalid call to init(), homepage, domain and host are not consistent');
-           return;
-         }
-         log.info('init_requested() called for ' + name + ' domain: ' + domain);
-
-         if (plugin.permissions_get_domain_dontask(domain) || plugin.permissions_get_domain_allowed(domain)) {
-           log.info('Domain already listed in allow or dont ask lists');
-           return;
-         }
-
-         var stampname = name + domain;
-         if (init_requested_stamps[stampname] == undefined) {
-           addInfobarRequestCallbackFor (sender.tab.id,
-                                         function (result) {
-                                           if (result && result.integrate) {
-                                             plugin.application_repository_generate_desktop_for_url_launch(name, domain, homepage, iconUrl);
-                                             plugin.application_repository_add_desktop_to_launcher(name, domain);
-                                             plugin.permissions_allow_domain(domain);
-                                           }
-                                           else {
-                                             plugin.permissions_dontask_domain(domain);
-                                           }
-                                         },
-	                                 chrome.i18n.getMessage("integration_copy", [name, domain]),
-                                         null);
-           init_requested_stamps[stampname] = true;
-           chrome.infobars.show ({tabId: sender.tab.id, path: "infobar.html"});
-         }
-       }
-     }; // handlers
-     
-     
-     // validate request
-     if ( ! request  || ! request.method) {
-       callback ({error: "Invalid request structure"});
-       return true;
-     }
-     if ( ! sender) {
-       callback ({error: "Invalid sender"});
-       return true;
-     }
-     if ( typeof (request.method) != 'string' || request.method.length == 0) {
-       callback ({error: "Invalid request method"});
-       return true;
-     }
-
-     log.info ('Got request: ' + request.method);
-
-     var handler = handlers [request.method];
-     
-     if (handler !== undefined && typeof(handler) == 'function') {
-       
-       log.info ('Calling handler for: ' + request.method);
-       
-       handler (request, sender, callback);
-       
-       return true;
-     }
-     return false;
-   } // var contentScriptsRequestHandler =
-
-   // Main event handler and communication link
-   //   w/ content scripts
-   chrome.runtime.onMessage.addListener (contentScriptsRequestHandler);
-
-
-   ///////////////////////////////////////////////////////////////////////
-   // 
-   // 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) { };
-    matchesIntegrationScripts (plugin,
-                               url,
-                               repo_,
-                               {
-                                 windowId: windowId,
-                                 tabId: tabId
-                               },
-                               onInstalled
-                              );
-   };
-   chrome.tabs.onCreated.addListener(
-     function(tab) {
-       if (tab && tab.url) {
-         onTabChanged(tab.id, tab.windowId, tab.url);
-       } // if (tab && tab.url) {
-     }
-   );
-   chrome.tabs.onUpdated.addListener (
-     function(tabId, changeInfo, tab) {
-       if (changeInfo && changeInfo.url) {
-         onTabChanged(tabId, tab.windowId, changeInfo.url);
-       }
-     }
-   );
-
-   return {
-     /*
-      *  Returns a potential message associated with a tab id (infobar)
-      */
-     getMessageForTabId: function (tabId)  {
-       return getDataIfAnyFor (tabId).message;
-     }
-   };
- }) ();
+    var init_requested_stamps = {};
+    var contentScriptsRequestHandler = function (request, sender, callback) {
+        var handlers = {
+            get_extension_settings: function (request, sender, callback) {
+                var settings = {
+                    logging: false,
+                    incognito: sender.tab.incognito
+                };
+	 
+                try {
+                    if (window.localStorage) {
+                       settings.logging = localStorage['logging'];
+                    }
+                }
+                catch (e) {
+                    console.log("Error while trying to retrieve logging information: " + str(e));
+                }
+
+	            callback (settings);
+            },
+            on_user_infobar_request_result: function (request, sender, callback) {
+                invokeAndRemoveCallbackIfAnyFor (request.tabId, request);
+            },
+            init_requested: function (request, sender, callback) {
+                sendNativeMessage({
+                        "method" : "url_loaded",
+                        "url" : request.options.url
+                    },
+                    function (response) {
+                        if (response.available) {
+                            addInfobarRequestCallbackFor(
+                                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.i18n.getMessage("integration_copy", [ response.appName, response.appDomain ]),
+                                null);
+
+                            chrome.infobars.show({ tabId: windowInfos.tabId, path: "infobar.html" });
+                        }
+                    });
+            }
+        };
+     
+        // validate request
+        if (!request  || !request.method) {
+            callback({ error: "Invalid request structure" });
+            return true;
+        }
+        if (!sender) {
+            callback({ error: "Invalid sender" });
+            return true;
+        }
+
+        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
+    chrome.runtime.onMessage.addListener (contentScriptsRequestHandler);
+    // }}}
+
+    ///////////////////////////////////////////////////////////////////////
+    // 
+    // 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,
+            null, // repo_,
+            {
+                windowId: windowId,
+                tabId: tabId
+            },
+            onInstalled
+        );
+    };
+
+    chrome.tabs.onCreated.addListener(
+        function(tab) {
+            if (tab && tab.url) {
+                onTabChanged(tab.id, tab.windowId, tab.url);
+            }
+        }
+    );
+
+    chrome.tabs.onUpdated.addListener(
+        function(tabId, changeInfo, tab) {
+            console.log("onUpdated " + changeInfo.url);
+            if (changeInfo && changeInfo.url) {
+                onTabChanged(tabId, tab.windowId, changeInfo.url);
+            }
+        }
+    );
+
+    /*
+     *  Returns a potential message associated with a tab id (infobar)
+     */
+    return {
+        getMessageForTabId: function (tabId)  {
+            return getDataIfAnyFor(tabId).message;
+        }
+    };
+})();
 

=== modified file 'chromium-extension/base-content-script.js'
--- chromium-extension/base-content-script.js	2013-12-16 07:15:32 +0000
+++ chromium-extension/base-content-script.js	2015-01-19 16:40:00 +0000
@@ -6,7 +6,7 @@
  *   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 
+ *   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.

=== added file 'chromium-extension/browser.js'
--- chromium-extension/browser.js	1970-01-01 00:00:00 +0000
+++ chromium-extension/browser.js	2015-01-19 16:40:00 +0000
@@ -0,0 +1,154 @@
+/**
+ * Handles all the related work to injecting the 'external' extension into the
+ * content script (well, more precisely the current environment), and the proxy
+ * responsbile for handling the API requests in a webapplication.
+ * 
+ */
+(function (currentWindow) {
+   var aWindow = currentWindow;
+   var plugin = null;
+   var service = null;
+   var api = {
+       init: function (options) {
+	   options.url = window.location.href;
+	   options.hostname = window.location.hostname;
+	   options.host = window.location.host;
+	   options.protocol = window.location.protocol;
+	   chrome.runtime.sendMessage (
+	       {method: "init_requested", options: options}
+	       , function (response) {});
+       }
+   };
+
+   /**
+    * Inserts a given script in the webpage.
+    * Needs chrome.extension functionality.
+    * 
+    * @param path of file to be injected (part of the extension)
+    */
+   var insertScriptIntoWebpage = function (path) {
+     var script = document.createElement ('script');
+     script.type = 'text/javascript';
+     script.src = chrome.runtime.getURL (path);
+     document.getElementsByTagName("head")[0].appendChild (script);
+   };
+
+   var injectApiProxy = function () {
+
+     // 1. inject a piece of javascript proxying all the requests
+     // to the unity webapps api
+     insertScriptIntoWebpage('unity-api-page-proxy-builder-gen.js');
+     insertScriptIntoWebpage('unity-api-page-proxy.js');
+
+     function makeWebpageCallback (id) {
+       // TODO/FIXME: add support for callback params (needed for DnD)
+       return function () {
+         var d = document.createElement ("textarea");
+         var e = document.createEvent ("Events");
+         d.style.cssText = "display:none;";
+         d.value = id;
+         d.addEventListener ("unity-webapps-chromium-api-com-link-callback-called-ack"
+                             , function() { d.parentNode.removeChild (d); }
+                             , true);
+         document.body.appendChild (d);
+         e.initEvent ("unity-webapps-chromium-api-com-link-callback-called", false, true);
+         d.dispatchEvent (e);
+       };
+     };
+
+     // TODO: should be shared / generated w/ web page code
+     var isIterableObject = function(obj) {
+        if (obj === undefined || obj === null) {
+          return false;
+        }
+       var t = typeof(obj);
+       var types = {'string': 0, 'function': 0, 'number': 0, 'undefined': 0, 'boolean': 0};
+       return types[t] === undefined;
+     };
+
+     /**
+      * Wraps callback ids in proper callback that dispatch to the
+      * webpage thru a proper event
+      *
+      */
+     function wrapCallbackIds (obj) {
+       if ( ! isIterableObject(obj)) {
+         return obj;
+       }
+       if (obj
+           && obj.hasOwnProperty('callbackid')
+           && obj.callbackid != null) {
+         return makeWebpageCallback (obj.callbackid);
+       }
+
+       var ret = (obj instanceof Array) ? [] : {};
+       for (var key in obj) {
+         if (obj.hasOwnProperty(key)) {
+
+           if (isIterableObject (obj[key])) {
+
+             if (obj[key].callbackid != null) {
+               ret[key] = makeWebpageCallback (obj[key].callbackid);
+             }
+             else {
+               ret[key] = wrapCallbackIds (obj[key]);
+             }
+           }
+           else {
+             ret[key] = obj[key];
+           }
+         }
+       }
+       return ret;
+     };
+
+     // 2. open the communication mean between the two
+
+     // TODO has the implicit knowledge of who's behind ...
+     var dispatchActualFunctionCall = function (funcname, args) {
+       var funcnames = funcname.split('.');
+       var reducetarget = api;
+
+       // a bit hacky
+       try {
+         // Assumes that we are calling a 'callable' from a succession of objects
+         funcnames.reduce (
+           function (prev, cur) {
+             return typeof prev[cur] == "function" ? prev[cur].bind(prev) : prev[cur];
+           }, reducetarget).apply (null, args);
+       } catch (err) {
+         console.log ('Error while dispatching call to ' + funcnames.join('.') + ': ' + err);
+       }
+     };
+     
+     document.addEventListener("unity-webapps-chromium-api-com-link"
+                               , function(event) {
+                                 var from = event.target;
+                                 if (from) {
+                                   var type = from.getAttribute("data-eventType");
+
+                                   var args = JSON.parse(from.value);
+                                   args = args.map (function (arg) { return wrapCallbackIds (arg); });
+
+                                   // Actuall call, e.g. 'Notification.showNotification("a","b")
+                                   // being reduces to successive calls to associated objects:
+                                   // Notification, showNotification
+                                   // 
+                                   // TODO add proper error handling
+                                   dispatchActualFunctionCall(type, args);
+                                 }
+
+                                 // send ack event to allow cleanup
+                                 var ret = document.createEvent('Events');
+                                 ret.initEvent('unity-webapps-chromium-api-com-link-ack', true, false);
+                                 from.dispatchEvent(ret);
+                               }
+                               , true);
+   };
+
+   // handle the proxy side of the api which is being injected on the
+   //  webpage
+   injectApiProxy();
+ }
+)(window);
+

=== removed file 'chromium-extension/browser.js'
--- chromium-extension/browser.js	2013-12-16 07:15:32 +0000
+++ chromium-extension/browser.js	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-/**
- * Handles all the related work to injecting the 'external' extension into the
- * content script (well, more precisely the current environment), and the proxy
- * responsbile for handling the API requests in a webapplication.
- * 
- */
-(function (currentWindow) {
-   var aWindow = currentWindow;
-   var plugin = null;
-   var service = null;
-   var api = {
-       init: function (options) {
-	   options.url = window.location.href;
-	   options.hostname = window.location.hostname;
-	   options.host = window.location.host;
-	   options.protocol = window.location.protocol;
-	   chrome.runtime.sendMessage (
-	       {method: "init_requested", options: options}
-	       , function (response) {});
-       }
-   };
-
-   /**
-    * Inserts a given script in the webpage.
-    * Needs chrome.extension functionality.
-    * 
-    * @param path of file to be injected (part of the extension)
-    */
-   var insertScriptIntoWebpage = function (path) {
-     var script = document.createElement ('script');
-     script.type = 'text/javascript';
-     script.src = chrome.runtime.getURL (path);
-     document.getElementsByTagName("head")[0].appendChild (script);
-   };
-
-   var injectApiProxy = function () {
-
-     // 1. inject a piece of javascript proxying all the requests
-     // to the unity webapps api
-     insertScriptIntoWebpage('unity-api-page-proxy-builder-gen.js');
-     insertScriptIntoWebpage('unity-api-page-proxy.js');
-
-     function makeWebpageCallback (id) {
-       // TODO/FIXME: add support for callback params (needed for DnD)
-       return function () {
-         var d = document.createElement ("textarea");
-         var e = document.createEvent ("Events");
-         d.style.cssText = "display:none;";
-         d.value = id;
-         d.addEventListener ("unity-webapps-chromium-api-com-link-callback-called-ack"
-                             , function() { d.parentNode.removeChild (d); }
-                             , true);
-         document.body.appendChild (d);
-         e.initEvent ("unity-webapps-chromium-api-com-link-callback-called", false, true);
-         d.dispatchEvent (e);
-       };
-     };
-
-     // TODO: should be shared / generated w/ web page code
-     var isIterableObject = function(obj) {
-        if (obj === undefined || obj === null) {
-          return false;
-        }
-       var t = typeof(obj);
-       var types = {'string': 0, 'function': 0, 'number': 0, 'undefined': 0, 'boolean': 0};
-       return types[t] === undefined;
-     };
-
-     /**
-      * Wraps callback ids in proper callback that dispatch to the
-      * webpage thru a proper event
-      *
-      */
-     function wrapCallbackIds (obj) {
-       if ( ! isIterableObject(obj)) {
-         return obj;
-       }
-       if (obj
-           && obj.hasOwnProperty('callbackid')
-           && obj.callbackid != null) {
-         return makeWebpageCallback (obj.callbackid);
-       }
-
-       var ret = (obj instanceof Array) ? [] : {};
-       for (var key in obj) {
-         if (obj.hasOwnProperty(key)) {
-
-           if (isIterableObject (obj[key])) {
-
-             if (obj[key].callbackid != null) {
-               ret[key] = makeWebpageCallback (obj[key].callbackid);
-             }
-             else {
-               ret[key] = wrapCallbackIds (obj[key]);
-             }
-           }
-           else {
-             ret[key] = obj[key];
-           }
-         }
-       }
-       return ret;
-     };
-
-     // 2. open the communication mean between the two
-
-     // TODO has the implicit knowledge of who's behind ...
-     var dispatchActualFunctionCall = function (funcname, args) {
-       var funcnames = funcname.split('.');
-       var reducetarget = api;
-
-       // a bit hacky
-       try {
-         // Assumes that we are calling a 'callable' from a succession of objects
-         funcnames.reduce (
-           function (prev, cur) {
-             return typeof prev[cur] == "function" ? prev[cur].bind(prev) : prev[cur];
-           }, reducetarget).apply (null, args);
-       } catch (err) {
-         console.log ('Error while dispatching call to ' + funcnames.join('.') + ': ' + err);
-       }
-     };
-     
-     document.addEventListener("unity-webapps-chromium-api-com-link"
-                               , function(event) {
-                                 var from = event.target;
-                                 if (from) {
-                                   var type = from.getAttribute("data-eventType");
-
-                                   var args = JSON.parse(from.value);
-                                   args = args.map (function (arg) { return wrapCallbackIds (arg); });
-
-                                   // Actuall call, e.g. 'Notification.showNotification("a","b")
-                                   // being reduces to successive calls to associated objects:
-                                   // Notification, showNotification
-                                   // 
-                                   // TODO add proper error handling
-                                   dispatchActualFunctionCall(type, args);
-                                 }
-
-                                 // send ack event to allow cleanup
-                                 var ret = document.createEvent('Events');
-                                 ret.initEvent('unity-webapps-chromium-api-com-link-ack', true, false);
-                                 from.dispatchEvent(ret);
-                               }
-                               , true);
-   };
-
-   // handle the proxy side of the api which is being injected on the
-   //  webpage
-   injectApiProxy();
- }
-)(window);
-

=== added file 'chromium-extension/chromium-extension.pro'
--- chromium-extension/chromium-extension.pro	1970-01-01 00:00:00 +0000
+++ chromium-extension/chromium-extension.pro	2015-01-19 16:40:00 +0000
@@ -0,0 +1,66 @@
+include(../common-project-config.pri)
+include($${TOP_SRC_DIR}/common-vars.pri)
+
+TEMPLATE = aux
+
+EXTENSION_DIR = $${INSTALL_LIBDIR}/libunity-chromium
+EXTENSION_NAME = unity-webapps
+EXTENSION_FILE = $${EXTENSION_NAME}.crx
+
+STATIC_EXTENSION_FILES = \
+    background-page.html \
+    background-page.js \
+    base-content-script.js \
+    browser.js \
+    infobar.css \
+    infobar.html \
+    infobar.js \
+    _locales \
+    options.html \
+    options.js \
+    skin \
+    unity-api-page-proxy-builder-gen.js \
+    unity-api-page-proxy.js \
+
+SCRIPT_FILES = \
+    $${STATIC_EXTENSION_FILES} \
+    manifest.json \
+    unity-webapps.json
+
+QMAKE_SUBSTITUTES += \
+    manifest.json.in \
+    unity-webapps.json.in
+
+pemfile.target = unity-webapps.pem
+pemfile.commands = "openssl genrsa 1024 > $${pemfile.target}"
+
+static_files.depends = \
+    $${SCRIPT_FILES}
+static_files.commands = mkdir -p $${OUT_PWD}/$${EXTENSION_NAME} && ${COPY_DIR} $${SCRIPT_FILES} $${OUT_PWD}/$${EXTENSION_NAME}
+
+static_files_stamp.target = buildstamp
+static_files_stamp.depends = static_files
+static_files_stamp.commands = touch $${static_files_stamp.target}
+
+extension.target = res/$${EXTENSION_NAME}.crx
+extension.commands = $${TOP_SRC_DIR}/chromium-extension/crxmake.sh $${OUT_PWD}/$${EXTENSION_NAME} $${pemfile.target}
+extension.depends = pemfile static_files_stamp
+
+QMAKE_EXTRA_TARGETS += \
+    extension \
+    pemfile \
+    static_files \
+    static_files_stamp
+
+PRE_TARGETDEPS = $${extension.target}
+
+manifest.files = \
+    $${OUT_PWD}/res/*.json
+manifest.path = $${INSTALL_PREFIX}/share/chromium/extensions/
+manifest.CONFIG = no_check_exist
+INSTALLS += manifest
+
+crx.files = res/$${EXTENSION_NAME}.crx
+crx.path = $${EXTENSION_DIR}
+crx.CONFIG = no_check_exist
+INSTALLS += crx

=== modified file 'chromium-extension/infobar.js'
--- chromium-extension/infobar.js	2013-07-10 18:12:23 +0000
+++ chromium-extension/infobar.js	2015-01-19 16:40:00 +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 || "";
+    });
   });
 };
 

=== modified file 'chromium-extension/manifest.json.in'
--- chromium-extension/manifest.json.in	2013-12-16 07:15:32 +0000
+++ chromium-extension/manifest.json.in	2015-01-19 16:40:00 +0000
@@ -1,51 +1,41 @@
 {
-  "name": "Unity WebApps Chromium extension",
-  "manifest_version": 2,
-  "minimum_chrome_version": "20.0",
-  "content_security_policy": "script-src 'self' chrome-extension://infobar.js 'unsafe-eval'; object-src 'self'",
-
-  "version": "@VERSION@",
-
-  "description": "Unity Webapps Chromium integration",
-
-  "web_accessible_resources": [
-   "browser.js",
-   "unity-api-page-proxy-builder-gen.js",
-   "unity-api-page-proxy.js",
-   "infobar.js",
-   "options.js"
+  '"name": "Unity WebApps Chromium extension"',
+  '"manifest_version"': 2,
+  '"minimum_chrome_version": "34.0"',
+  '"content_security_policy"': '"script-src \'self\' chrome-extension://infobar.js \'unsafe-eval\'; object-src \'self\'"',
+
+  '"version": "$${PROJECT_VERSION}"',
+
+  '"description": "Unity Webapps Chromium integration"',
+
+  '"web_accessible_resources"': [
+    '"browser.js"',
+    '"unity-api-page-proxy-builder-gen.js"',
+    '"unity-api-page-proxy.js"',
+    '"infobar.js"',
+    '"options.js"'
   ],
 
-  "icons": {
-    "16": "skin/cof-16.png",
-    "48": "skin/cof-48.png"
-    },    
-
-  "default_locale": "en",
-
-  "background": {
-    "page": "background-page.html"
+  '"icons"': {
+    '"16": "skin/cof-16.png"',
+    '"48": "skin/cof-48.png"'
+  },    
+
+  '"default_locale": "en"',
+
+  '"background"': {
+    '"page"': '"background-page.html"'
   },  
 
-  "permissions": ["tabs", "http://*/*", "infobars"],
-  "options_page": "options.html",
+  '"permissions": ["tabs", "http://*/*", "infobars", "nativeMessaging"]',
+  '"options_page": "options.html"',
   
-  "plugins": [
-
-    /** The "path" property specifies the path to your plugin, relative to the manifest file.
-     * The "public" property specifies whether your plugin can be accessed by regular web pages;
-     * the default is false, meaning only your extension can load the plugin.
-     */
-    { "path": "libunity_npapi_plugin.so", "public": false }
-
-  ],
-
-  "content_scripts": [
+  '"content_scripts"': [
     {
-      "all_frames": true,
-      "matches": [ "<all_urls>" ],
-      "js": ["base-content-script.js"],
-      "run_at": "document_end"	
+      '"all_frames"': true,
+      '"matches": [ "<all_urls>" ]',
+      '"js": ["base-content-script.js"]',
+      '"run_at": "document_end"'
     }
   ]
 }

=== added file 'chromium-extension/unity-api-page-proxy-builder-gen.js'
--- chromium-extension/unity-api-page-proxy-builder-gen.js	1970-01-01 00:00:00 +0000
+++ chromium-extension/unity-api-page-proxy-builder-gen.js	2015-01-19 16:40:00 +0000
@@ -0,0 +1,384 @@
+var UnityWebappsApiPageProxyBuilder = function(backend) {
+  
+  var dummy = true;
+  var unity = { context: dummy, contextReady: dummy };
+  var uwa = { ContextActionCallbackType: null };
+
+  var CallbackManager = {
+    makeCallback: function (dumd, func) {
+      return func;
+    }
+  };
+
+  function checkString(str, allowUndef) {
+    if (allowUndef && str == undefined) {
+      return;
+        }
+    if (!str || typeof(str) !== 'string') {
+      throw new TypeError("incorrect argument");
+    }
+  }
+
+  var findName = function (func, prefix, obj) {
+    
+    if (!prefix) {
+      return findName(func, 'Unity.', api);
+    }
+    var keys = Object.keys(obj);
+    for (var i = 0; i < keys.length; i++) {
+      if (typeof(keys[i]) !== 'string') {
+        continue;
+      }
+      var descr = Object.getOwnPropertyDescriptor(obj, keys[i]);
+      if (descr.value === func) {
+        return prefix + keys[i];
+      }
+      if (descr.value instanceof Object) {
+        var res = findName(func, prefix + keys[i] + '.', obj[keys[i]]);
+        if (res)
+          return res;
+      }
+      if (obj.__lookupGetter__(keys[i]) === func) {
+        return prefix + keys[i];
+      }
+      if (obj.__lookupSetter__(keys[i]) === func) {
+        return prefix + keys[i];
+      }
+    }
+    return null;
+
+  };
+
+
+  var stringify = function (obj) {
+    
+    if (obj === undefined)
+      return obj;
+    if (obj === null)
+      return obj;
+    if (typeof(obj) == 'string')
+      return obj;
+    if (typeof(obj) == 'number')
+      return obj;
+    if (typeof(obj) == 'function')
+      return String(obj);
+    var dump = {};
+    for (var i in obj) {
+      if (obj.hasOwnProperty(i))
+        dump[i] = stringify(obj[i]);
+    }
+    return dump;
+
+  };
+
+
+  var stringifyArgs = function (obj) {
+    
+    var args = [];
+    for (var i = 0; i < obj.length; i++) {
+      args.push(stringify(obj[i]));
+    }
+    var res = JSON.stringify(args);
+    return res.substr(1, res.length - 2);
+  };
+
+  var createArgumentsSanitaizer = function (func, argsDesc, callback) {
+    
+    return function () {
+      var realArgs = arguments;
+      var name = findName(arguments.callee);
+
+      var k = 0;
+      function argumentSanitaizer(desc, arg) {
+        if (!desc) {
+          throw new InternalError("argument description is null");
+        }
+        if (desc.dummy) {
+          k--;
+          return null;
+        }
+        if (desc.array) {
+          if (!(desc.array instanceof Object) || !(desc.array.element instanceof Object)) {
+            throw new InternalError("invalid argument description");
+          }
+          
+          try {
+            for (var j = 0; j < arg.length; j++) {
+              argumentSanitaizer(desc.array.element, arg[j]);
+            }
+          } catch (x) {
+            throw new TypeError("incorrect argument");
+          }
+
+          return arg;
+        }
+        if (desc.obj) {
+          if (!(desc.obj instanceof Object)) {
+            throw new InternalError("invalid argument description");
+          }
+          var res = {}, i;
+          for (i in desc.obj) {
+            if (desc.obj.hasOwnProperty(i)) {
+              res[i] = argumentSanitaizer(desc.obj[i], arg[i]);
+            }
+          }
+          return res;
+        }
+        if (desc.str) {
+          if (desc.allowNull && !arg) {
+            return null;
+          }
+          checkString(arg, false);
+          return arg;
+        }
+        if (desc.number) {
+          if (typeof(arg) !== 'number' && typeof(arg) !== 'boolean')
+            throw new TypeError("incorrect argument");
+          return arg;
+        }
+        if (!desc.type) {
+          throw new InternalError("argument description miss required parameter");
+        }
+        if ((arg instanceof desc.type) || (desc.type === Function && ((typeof arg) === 'function'))
+            || (arg === null && desc.allowNull)) {
+          if (desc.type === Function) {
+            if (!arg) {
+              return null;
+            }
+
+            var id;
+            if (desc.argAsCallbackId !== undefined) {
+              id = realArgs[desc.argAsCallbackId];
+            }
+            return CallbackManager.makeCallback(uwa.ContextActionCallbackType,
+                                                function (context, user_data) {
+                                                  arg();
+                                                }, name, id);
+          }
+          return arg;
+        } else {
+          throw new TypeError("incorrect argument");
+        }
+        throw new InternalError("unreacheable");
+      }
+      var args = [unity.context], i;
+      for (i = 0; i < argsDesc.length; i++) {
+        if (k >= realArgs.length && k > 0 && !argsDesc[i].dummy) {
+          throw new Error("not enough arguments");
+        }
+        var value = argumentSanitaizer(argsDesc[i], realArgs[k]);
+        k++;
+        
+        if (argsDesc[i].obj) {
+          args = args.concat(value);
+        } else {
+          args.push(value);
+        }
+      }
+
+      if (k < realArgs.length) {
+        throw new Error("too much arguments");
+      }
+
+      if (callback)
+        callback.apply(uwa, args);
+      if (func)
+        return Function.apply.apply(func, [uwa, args]);
+
+      return null;
+    };
+
+  };
+  var api = {
+    init: function(props) {
+      checkString(props.name, false);
+      checkString(props.iconUrl, true);
+      checkString(props.domain, true);
+      checkString(props.login, true);
+      checkString(props.mimeTypes, true);
+      checkString(props.homepage, true);
+      if (props.homepage && !/^(http|https|file):\/\//.test(props.homepage)) {
+        throw new TypeError("incorrect argument");
+      }
+      backend("init", [props]);
+    }
+    ,
+    acceptData: createArgumentsSanitaizer(null,
+                                          [{ array: { element: { str: true } } }, { type: Function, js: true }],
+                                          function (context, mimeTypes, callback) {
+                                            backend('acceptData', [mimeTypes, callback]);
+                                          })
+    ,
+    addAction: createArgumentsSanitaizer(null,
+                                         [{ str: true }, { type: Function, argAsCallbackId: 0 }],
+                                         function (context, name, callback) {
+                                           backend('addAction', [name, callback]);
+                                         })
+    ,
+    clearAction: createArgumentsSanitaizer(null,
+					   [{ str: true }]
+                                           , function (context, name) {
+                                             backend('clearAction', [name]);
+                                           })
+    ,
+    clearActions: createArgumentsSanitaizer(null,
+					    [],
+                                            function (context) {
+                                              backend('clearActions', []);
+                                            })
+    ,
+    MediaPlayer: {
+      init: createArgumentsSanitaizer(null,
+                                      [{ str: true }],
+                                      function (context, name) {
+                                        backend('MediaPlayer.init', [name]);
+                                      })
+      ,
+      onPlayPause: createArgumentsSanitaizer(null,
+                                             [{ type: Function, allowNull: true }, { dummy: true }],
+                                             function (context, callback) {
+                                               backend('MediaPlayer.onPlayPause', [callback]);
+                                             }
+                                            )
+      ,
+      onPrevious: createArgumentsSanitaizer(null,
+                                            [{ type: Function, allowNull: true }, { dummy: true }],
+                                           function (context, callback) {
+                                             backend('MediaPlayer.onPrevious', [callback]);
+                                           })
+      ,
+      onNext: createArgumentsSanitaizer(null,
+                                        [{ type: Function, allowNull: true }, { dummy: true }],
+                                        function (context, callback) {
+                                          backend('MediaPlayer.onNext', [callback]);
+                                        }
+                                       )
+      ,
+      setTrack: createArgumentsSanitaizer(null,
+                                          [{ obj: { artist: { str: true, place: 0, allowNull: true },
+                                                    album: { str: true, place: 1, allowNull: true },
+                                                    title: { str: true, place: 2 },
+                                                    artLocation: { str: true, place: 3, allowNull: true } } }],
+                                         function (context, trackinfos) {
+                                           backend('MediaPlayer.setTrack', [trackinfos]);
+                                         })
+      ,
+      setCanGoNext: createArgumentsSanitaizer(null,
+                                              [{ number: true }],
+                                              function (context, v) {
+                                                backend('MediaPlayer.setCanGoNext', [v]);
+                                              }
+                                             )
+      ,
+      setCanGoPrevious: createArgumentsSanitaizer(null,
+                                                  [{ number: true }],
+                                                  function (context, v) {
+                                                    backend('MediaPlayer.setCanGoPrevious', [v]);
+                                                  }
+                                                 )
+      ,
+      setCanPlay: createArgumentsSanitaizer(null,
+                                            [{ number: true }],
+                                            function (context, v) { backend('MediaPlayer.setCanPlay', [v]); }
+                                           )
+      ,
+      setCanPause: createArgumentsSanitaizer(null,
+                                             [{ number: true }],
+                                             function (context, v) { backend('MediaPlayer.setCanPause', [v]); }
+                                            )
+      ,
+      setPlaybackState: createArgumentsSanitaizer(null,
+                                                  [{ number: true }],
+                                                  function (context, v) { backend('MediaPlayer.setPlaybackState', [v]); }
+                                                 )
+      ,
+      getPlaybackState: createArgumentsSanitaizer(null
+                                                  , [{ type: Function }]
+                                                  , function (context, callback) {
+                                                    backend('MediaPlayer.getPlaybackState', [callback]);
+                                                  }
+                                                 )
+      ,
+      PlaybackState: {PLAYING: 0, PAUSED:1}
+    },
+
+    Notification: {
+      showNotification: createArgumentsSanitaizer(null,
+                                                  [{ str: true }, { str: true }, { str: true, allowNull: true }],
+                                                  function (context, title, name, dummy) {
+                                                    backend('Notification.showNotification', [title, name, dummy]);
+                                                  }
+                                                 )
+    },
+
+    Launcher: {
+      setCount: createArgumentsSanitaizer(null,
+                                          [{ number: true }],
+                                          function (context, count) {
+                                            backend('Launcher.setCount', [count]);
+                                          }
+                                         )
+      ,
+      clearCount: createArgumentsSanitaizer(null,
+                                            [],
+                                            function (context) {
+                                              backend('Launcher.clearCount', []);
+                                            }),
+      setProgress: createArgumentsSanitaizer(null,
+                                             [{ number: true }],
+                                             function (context, progress) {
+                                               backend('Launcher.setProgress', [progress]);
+                                             }
+                                            )
+      ,
+      clearProgress: createArgumentsSanitaizer(null,
+                                               [],
+                                              function (context) {
+                                                backend('Launcher.clearProgress', []);
+                                              }
+                                              )
+      ,
+      setUrgent: createArgumentsSanitaizer(null,
+                                           [],
+                                           function (context) {
+                                             backend('Launcher.setUrgent', []);
+                                           }
+                                          )
+      ,
+      addAction: function(arg1, arg2) {
+        backend('Launcher.addAction', [arg1, arg2]);
+      }
+      ,
+      removeAction: createArgumentsSanitaizer(null,
+                                              [{ str: true }],
+                                              function (context, name) {
+                                                backend('Launcher.removeAction', [name]);
+                                              }
+                                             )
+      ,
+      removeActions: createArgumentsSanitaizer(null,
+                                               [],
+                                               function (context) {
+                                                 backend('Launcher.removeActions', []);
+                                               }
+                                              )
+    },
+    MessagingIndicator: {
+      addAction: createArgumentsSanitaizer(null,
+                                           [{ str: true }, { type: Function, argAsCallbackId: 0 }, { dummy: true }],
+                                           function (context, name, callback, dummy) {
+                                             backend('MessagingIndicator.addAction', [name, callback, dummy]);
+                                           }
+                                          )
+      ,
+      showIndicator: function(name, properties) {
+        backend('MessagingIndicator.showIndicator', [name, properties]);
+      }
+      ,
+      clearIndicator: createArgumentsSanitaizer(null, [{ str: true }], function(context, name) { backend('MessagingIndicator.clearIndicator', [name]); }),
+      clearIndicators: createArgumentsSanitaizer(null, [], function (context) { backend('MessagingIndicator.clearIndicators', []); })
+    }
+  };
+  return api;
+};
+

=== removed file 'chromium-extension/unity-api-page-proxy-builder-gen.js'
--- chromium-extension/unity-api-page-proxy-builder-gen.js	2013-11-01 06:37:07 +0000
+++ chromium-extension/unity-api-page-proxy-builder-gen.js	1970-01-01 00:00:00 +0000
@@ -1,384 +0,0 @@
-var UnityWebappsApiPageProxyBuilder = function(backend) {
-  
-  var dummy = true;
-  var unity = { context: dummy, contextReady: dummy };
-  var uwa = { ContextActionCallbackType: null };
-
-  var CallbackManager = {
-    makeCallback: function (dumd, func) {
-      return func;
-    }
-  };
-
-  function checkString(str, allowUndef) {
-    if (allowUndef && str == undefined) {
-      return;
-        }
-    if (!str || typeof(str) !== 'string') {
-      throw new TypeError("incorrect argument");
-    }
-  }
-
-  var findName = function (func, prefix, obj) {
-    
-    if (!prefix) {
-      return findName(func, 'Unity.', api);
-    }
-    var keys = Object.keys(obj);
-    for (var i = 0; i < keys.length; i++) {
-      if (typeof(keys[i]) !== 'string') {
-        continue;
-      }
-      var descr = Object.getOwnPropertyDescriptor(obj, keys[i]);
-      if (descr.value === func) {
-        return prefix + keys[i];
-      }
-      if (descr.value instanceof Object) {
-        var res = findName(func, prefix + keys[i] + '.', obj[keys[i]]);
-        if (res)
-          return res;
-      }
-      if (obj.__lookupGetter__(keys[i]) === func) {
-        return prefix + keys[i];
-      }
-      if (obj.__lookupSetter__(keys[i]) === func) {
-        return prefix + keys[i];
-      }
-    }
-    return null;
-
-  };
-
-
-  var stringify = function (obj) {
-    
-    if (obj === undefined)
-      return obj;
-    if (obj === null)
-      return obj;
-    if (typeof(obj) == 'string')
-      return obj;
-    if (typeof(obj) == 'number')
-      return obj;
-    if (typeof(obj) == 'function')
-      return String(obj);
-    var dump = {};
-    for (var i in obj) {
-      if (obj.hasOwnProperty(i))
-        dump[i] = stringify(obj[i]);
-    }
-    return dump;
-
-  };
-
-
-  var stringifyArgs = function (obj) {
-    
-    var args = [];
-    for (var i = 0; i < obj.length; i++) {
-      args.push(stringify(obj[i]));
-    }
-    var res = JSON.stringify(args);
-    return res.substr(1, res.length - 2);
-  };
-
-  var createArgumentsSanitaizer = function (func, argsDesc, callback) {
-    
-    return function () {
-      var realArgs = arguments;
-      var name = findName(arguments.callee);
-
-      var k = 0;
-      function argumentSanitaizer(desc, arg) {
-        if (!desc) {
-          throw new InternalError("argument description is null");
-        }
-        if (desc.dummy) {
-          k--;
-          return null;
-        }
-        if (desc.array) {
-          if (!(desc.array instanceof Object) || !(desc.array.element instanceof Object)) {
-            throw new InternalError("invalid argument description");
-          }
-          
-          try {
-            for (var j = 0; j < arg.length; j++) {
-              argumentSanitaizer(desc.array.element, arg[j]);
-            }
-          } catch (x) {
-            throw new TypeError("incorrect argument");
-          }
-
-          return arg;
-        }
-        if (desc.obj) {
-          if (!(desc.obj instanceof Object)) {
-            throw new InternalError("invalid argument description");
-          }
-          var res = {}, i;
-          for (i in desc.obj) {
-            if (desc.obj.hasOwnProperty(i)) {
-              res[i] = argumentSanitaizer(desc.obj[i], arg[i]);
-            }
-          }
-          return res;
-        }
-        if (desc.str) {
-          if (desc.allowNull && !arg) {
-            return null;
-          }
-          checkString(arg, false);
-          return arg;
-        }
-        if (desc.number) {
-          if (typeof(arg) !== 'number' && typeof(arg) !== 'boolean')
-            throw new TypeError("incorrect argument");
-          return arg;
-        }
-        if (!desc.type) {
-          throw new InternalError("argument description miss required parameter");
-        }
-        if ((arg instanceof desc.type) || (desc.type === Function && ((typeof arg) === 'function'))
-            || (arg === null && desc.allowNull)) {
-          if (desc.type === Function) {
-            if (!arg) {
-              return null;
-            }
-
-            var id;
-            if (desc.argAsCallbackId !== undefined) {
-              id = realArgs[desc.argAsCallbackId];
-            }
-            return CallbackManager.makeCallback(uwa.ContextActionCallbackType,
-                                                function (context, user_data) {
-                                                  arg();
-                                                }, name, id);
-          }
-          return arg;
-        } else {
-          throw new TypeError("incorrect argument");
-        }
-        throw new InternalError("unreacheable");
-      }
-      var args = [unity.context], i;
-      for (i = 0; i < argsDesc.length; i++) {
-        if (k >= realArgs.length && k > 0 && !argsDesc[i].dummy) {
-          throw new Error("not enough arguments");
-        }
-        var value = argumentSanitaizer(argsDesc[i], realArgs[k]);
-        k++;
-        
-        if (argsDesc[i].obj) {
-          args = args.concat(value);
-        } else {
-          args.push(value);
-        }
-      }
-
-      if (k < realArgs.length) {
-        throw new Error("too much arguments");
-      }
-
-      if (callback)
-        callback.apply(uwa, args);
-      if (func)
-        return Function.apply.apply(func, [uwa, args]);
-
-      return null;
-    };
-
-  };
-  var api = {
-    init: function(props) {
-      checkString(props.name, false);
-      checkString(props.iconUrl, true);
-      checkString(props.domain, true);
-      checkString(props.login, true);
-      checkString(props.mimeTypes, true);
-      checkString(props.homepage, true);
-      if (props.homepage && !/^(http|https|file):\/\//.test(props.homepage)) {
-        throw new TypeError("incorrect argument");
-      }
-      backend("init", [props]);
-    }
-    ,
-    acceptData: createArgumentsSanitaizer(null,
-                                          [{ array: { element: { str: true } } }, { type: Function, js: true }],
-                                          function (context, mimeTypes, callback) {
-                                            backend('acceptData', [mimeTypes, callback]);
-                                          })
-    ,
-    addAction: createArgumentsSanitaizer(null,
-                                         [{ str: true }, { type: Function, argAsCallbackId: 0 }],
-                                         function (context, name, callback) {
-                                           backend('addAction', [name, callback]);
-                                         })
-    ,
-    clearAction: createArgumentsSanitaizer(null,
-					   [{ str: true }]
-                                           , function (context, name) {
-                                             backend('clearAction', [name]);
-                                           })
-    ,
-    clearActions: createArgumentsSanitaizer(null,
-					    [],
-                                            function (context) {
-                                              backend('clearActions', []);
-                                            })
-    ,
-    MediaPlayer: {
-      init: createArgumentsSanitaizer(null,
-                                      [{ str: true }],
-                                      function (context, name) {
-                                        backend('MediaPlayer.init', [name]);
-                                      })
-      ,
-      onPlayPause: createArgumentsSanitaizer(null,
-                                             [{ type: Function, allowNull: true }, { dummy: true }],
-                                             function (context, callback) {
-                                               backend('MediaPlayer.onPlayPause', [callback]);
-                                             }
-                                            )
-      ,
-      onPrevious: createArgumentsSanitaizer(null,
-                                            [{ type: Function, allowNull: true }, { dummy: true }],
-                                           function (context, callback) {
-                                             backend('MediaPlayer.onPrevious', [callback]);
-                                           })
-      ,
-      onNext: createArgumentsSanitaizer(null,
-                                        [{ type: Function, allowNull: true }, { dummy: true }],
-                                        function (context, callback) {
-                                          backend('MediaPlayer.onNext', [callback]);
-                                        }
-                                       )
-      ,
-      setTrack: createArgumentsSanitaizer(null,
-                                          [{ obj: { artist: { str: true, place: 0, allowNull: true },
-                                                    album: { str: true, place: 1, allowNull: true },
-                                                    title: { str: true, place: 2 },
-                                                    artLocation: { str: true, place: 3, allowNull: true } } }],
-                                         function (context, trackinfos) {
-                                           backend('MediaPlayer.setTrack', [trackinfos]);
-                                         })
-      ,
-      setCanGoNext: createArgumentsSanitaizer(null,
-                                              [{ number: true }],
-                                              function (context, v) {
-                                                backend('MediaPlayer.setCanGoNext', [v]);
-                                              }
-                                             )
-      ,
-      setCanGoPrevious: createArgumentsSanitaizer(null,
-                                                  [{ number: true }],
-                                                  function (context, v) {
-                                                    backend('MediaPlayer.setCanGoPrevious', [v]);
-                                                  }
-                                                 )
-      ,
-      setCanPlay: createArgumentsSanitaizer(null,
-                                            [{ number: true }],
-                                            function (context, v) { backend('MediaPlayer.setCanPlay', [v]); }
-                                           )
-      ,
-      setCanPause: createArgumentsSanitaizer(null,
-                                             [{ number: true }],
-                                             function (context, v) { backend('MediaPlayer.setCanPause', [v]); }
-                                            )
-      ,
-      setPlaybackState: createArgumentsSanitaizer(null,
-                                                  [{ number: true }],
-                                                  function (context, v) { backend('MediaPlayer.setPlaybackState', [v]); }
-                                                 )
-      ,
-      getPlaybackState: createArgumentsSanitaizer(null
-                                                  , [{ type: Function }]
-                                                  , function (context, callback) {
-                                                    backend('MediaPlayer.getPlaybackState', [callback]);
-                                                  }
-                                                 )
-      ,
-      PlaybackState: {PLAYING: 0, PAUSED:1}
-    },
-
-    Notification: {
-      showNotification: createArgumentsSanitaizer(null,
-                                                  [{ str: true }, { str: true }, { str: true, allowNull: true }],
-                                                  function (context, title, name, dummy) {
-                                                    backend('Notification.showNotification', [title, name, dummy]);
-                                                  }
-                                                 )
-    },
-
-    Launcher: {
-      setCount: createArgumentsSanitaizer(null,
-                                          [{ number: true }],
-                                          function (context, count) {
-                                            backend('Launcher.setCount', [count]);
-                                          }
-                                         )
-      ,
-      clearCount: createArgumentsSanitaizer(null,
-                                            [],
-                                            function (context) {
-                                              backend('Launcher.clearCount', []);
-                                            }),
-      setProgress: createArgumentsSanitaizer(null,
-                                             [{ number: true }],
-                                             function (context, progress) {
-                                               backend('Launcher.setProgress', [progress]);
-                                             }
-                                            )
-      ,
-      clearProgress: createArgumentsSanitaizer(null,
-                                               [],
-                                              function (context) {
-                                                backend('Launcher.clearProgress', []);
-                                              }
-                                              )
-      ,
-      setUrgent: createArgumentsSanitaizer(null,
-                                           [],
-                                           function (context) {
-                                             backend('Launcher.setUrgent', []);
-                                           }
-                                          )
-      ,
-      addAction: function(arg1, arg2) {
-        backend('Launcher.addAction', [arg1, arg2]);
-      }
-      ,
-      removeAction: createArgumentsSanitaizer(null,
-                                              [{ str: true }],
-                                              function (context, name) {
-                                                backend('Launcher.removeAction', [name]);
-                                              }
-                                             )
-      ,
-      removeActions: createArgumentsSanitaizer(null,
-                                               [],
-                                               function (context) {
-                                                 backend('Launcher.removeActions', []);
-                                               }
-                                              )
-    },
-    MessagingIndicator: {
-      addAction: createArgumentsSanitaizer(null,
-                                           [{ str: true }, { type: Function, argAsCallbackId: 0 }, { dummy: true }],
-                                           function (context, name, callback, dummy) {
-                                             backend('MessagingIndicator.addAction', [name, callback, dummy]);
-                                           }
-                                          )
-      ,
-      showIndicator: function(name, properties) {
-        backend('MessagingIndicator.showIndicator', [name, properties]);
-      }
-      ,
-      clearIndicator: createArgumentsSanitaizer(null, [{ str: true }], function(context, name) { backend('MessagingIndicator.clearIndicator', [name]); }),
-      clearIndicators: createArgumentsSanitaizer(null, [], function (context) { backend('MessagingIndicator.clearIndicators', []); })
-    }
-  };
-  return api;
-};
-

=== added file 'chromium-extension/unity-api-page-proxy.js'
--- chromium-extension/unity-api-page-proxy.js	1970-01-01 00:00:00 +0000
+++ chromium-extension/unity-api-page-proxy.js	2015-01-19 16:40:00 +0000
@@ -0,0 +1,146 @@
+/**
+ * 
+ * 
+ */
+setTimeout (
+  function () {
+    var CallbackManagerBuilder = function () {
+      var prepend = 'unity-webapps-chromium-api';
+      var callbacks = {};
+      return {
+        store: function (callback) {
+          var gensym = function() { return prepend + Math.random(); };
+          var id = gensym();
+          while (undefined != callbacks[id]) {
+            id = gensym();
+          }
+          callbacks[id] = callback;
+          return id;
+        }
+        ,
+        get: function (id) {
+          return callbacks[id];
+        }
+      };
+    };
+    var callbackmanager = CallbackManagerBuilder();
+
+   /**
+    * Acknowledge that the API has been fully injected
+    */
+    var sendApiCreatedAcknowledge = function () {
+      var e = document.createEvent ("Events");
+      e.initEvent ("unity-webapps-api-ready", false, false);
+      document.dispatchEvent (e);
+    };
+
+    /**
+     * 
+     * 
+     */
+    function sendToApi (type, data) {
+      var callback = null;
+      var d = document.createElement ("textarea");
+      var e = document.createEvent ("Events");
+      d.style.cssText = "display:none;";
+
+      var isIterableObject = function(obj) {
+        if (obj === undefined || obj === null) {
+          return false;
+        }
+        var t = typeof(obj);
+        var types = {'string': 0, 'function': 0, 'boolean': 0, 'number': 0, 'undefined': 0};
+        return types[t] === undefined;
+      };
+
+      function transformToIdIfNecessary(obj) {
+        var ret = obj;
+        if (obj instanceof Function) {
+          var id = callbackmanager.store(obj);
+          ret = {callbackid: id};
+        }
+        return ret;
+      }
+      // map function callback (not serializable to a different world)
+      //  to ids
+      function transformCallbacksToIds (obj) {
+        if ( ! isIterableObject(obj)) {
+          return transformToIdIfNecessary (obj);
+        }
+        var ret = (obj instanceof Array) ? [] : {};
+        for (var key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            if (obj[key] instanceof Function) {
+              var id = callbackmanager.store(obj[key]);
+              ret[key] = {callbackid: id};
+            }
+            else if (isIterableObject (obj[key])) {
+              ret[key] = transformCallbacksToIds (obj[key]);
+            }
+            else {
+              ret[key] = obj[key];
+            }
+          }
+        }
+        return ret;
+      };
+
+      // TODO: assumes some structure, does not play well w/ arrays
+      // actually converts: [1,2,3] -> {'0': 1, '1': 2, '2': 3}
+      d.value = JSON.stringify (
+        data.map (
+          function (datum) {
+            return transformCallbacksToIds (datum);
+          }
+        )
+      );
+      d.addEventListener ("unity-webapps-chromium-api-com-link-ack"
+                          ,
+                          function() {
+                            if (callback) callback (d.value);
+                            d.parentNode.removeChild (d);
+                          }
+                          , true);
+
+      d.setAttribute ("data-eventType", type);
+      document.body.appendChild (d);
+      e.initEvent ("unity-webapps-chromium-api-com-link", false, true);
+      d.dispatchEvent (e);
+    };
+
+    document.addEventListener ("unity-webapps-chromium-api-com-link-callback-called"
+                               ,
+                               function(event) {
+                                 var from = event.target;
+                                 if (from) {
+                                   if (from.value) {
+                                     var callback = callbackmanager.get(from.value);
+                                     if (callback) {
+                                       callback ();
+                                     }
+                                   }
+                                   var ret = document.createEvent('Events');
+                                   ret.initEvent('unity-webapps-chromium-api-com-link-callback-called-ack', true, false);
+                                   from.dispatchEvent(ret);
+                                 }
+                               }
+                               , true);
+
+    var api = UnityWebappsApiPageProxyBuilder(sendToApi);
+
+    function unity() {
+    }
+    unity.prototype = {
+      __proto__: window.external,
+      getUnityObject: function (version) {
+        console.log ('Proxy: getUnityObject called with version ' + version);
+        if (version === 1)
+          return api;
+        throw new Error("incorrect version");
+      }
+    };
+    window.external = new unity();
+
+    sendApiCreatedAcknowledge();
+  }
+, 0);

=== removed file 'chromium-extension/unity-api-page-proxy.js'
--- chromium-extension/unity-api-page-proxy.js	2013-12-16 07:15:32 +0000
+++ chromium-extension/unity-api-page-proxy.js	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-/**
- * 
- * 
- */
-setTimeout (
-  function () {
-    var CallbackManagerBuilder = function () {
-      var prepend = 'unity-webapps-chromium-api';
-      var callbacks = {};
-      return {
-        store: function (callback) {
-          var gensym = function() { return prepend + Math.random(); };
-          var id = gensym();
-          while (undefined != callbacks[id]) {
-            id = gensym();
-          }
-          callbacks[id] = callback;
-          return id;
-        }
-        ,
-        get: function (id) {
-          return callbacks[id];
-        }
-      };
-    };
-    var callbackmanager = CallbackManagerBuilder();
-
-   /**
-    * Acknowledge that the API has been fully injected
-    */
-    var sendApiCreatedAcknowledge = function () {
-      var e = document.createEvent ("Events");
-      e.initEvent ("unity-webapps-api-ready", false, false);
-      document.dispatchEvent (e);
-    };
-
-    /**
-     * 
-     * 
-     */
-    function sendToApi (type, data) {
-      var callback = null;
-      var d = document.createElement ("textarea");
-      var e = document.createEvent ("Events");
-      d.style.cssText = "display:none;";
-
-      var isIterableObject = function(obj) {
-        if (obj === undefined || obj === null) {
-          return false;
-        }
-        var t = typeof(obj);
-        var types = {'string': 0, 'function': 0, 'boolean': 0, 'number': 0, 'undefined': 0};
-        return types[t] === undefined;
-      };
-
-      function transformToIdIfNecessary(obj) {
-        var ret = obj;
-        if (obj instanceof Function) {
-          var id = callbackmanager.store(obj);
-          ret = {callbackid: id};
-        }
-        return ret;
-      }
-      // map function callback (not serializable to a different world)
-      //  to ids
-      function transformCallbacksToIds (obj) {
-        if ( ! isIterableObject(obj)) {
-          return transformToIdIfNecessary (obj);
-        }
-        var ret = (obj instanceof Array) ? [] : {};
-        for (var key in obj) {
-          if (obj.hasOwnProperty(key)) {
-            if (obj[key] instanceof Function) {
-              var id = callbackmanager.store(obj[key]);
-              ret[key] = {callbackid: id};
-            }
-            else if (isIterableObject (obj[key])) {
-              ret[key] = transformCallbacksToIds (obj[key]);
-            }
-            else {
-              ret[key] = obj[key];
-            }
-          }
-        }
-        return ret;
-      };
-
-      // TODO: assumes some structure, does not play well w/ arrays
-      // actually converts: [1,2,3] -> {'0': 1, '1': 2, '2': 3}
-      d.value = JSON.stringify (
-        data.map (
-          function (datum) {
-            return transformCallbacksToIds (datum);
-          }
-        )
-      );
-      d.addEventListener ("unity-webapps-chromium-api-com-link-ack"
-                          ,
-                          function() {
-                            if (callback) callback (d.value);
-                            d.parentNode.removeChild (d);
-                          }
-                          , true);
-
-      d.setAttribute ("data-eventType", type);
-      document.body.appendChild (d);
-      e.initEvent ("unity-webapps-chromium-api-com-link", false, true);
-      d.dispatchEvent (e);
-    };
-
-    document.addEventListener ("unity-webapps-chromium-api-com-link-callback-called"
-                               ,
-                               function(event) {
-                                 var from = event.target;
-                                 if (from) {
-                                   if (from.value) {
-                                     var callback = callbackmanager.get(from.value);
-                                     if (callback) {
-                                       callback ();
-                                     }
-                                   }
-                                   var ret = document.createEvent('Events');
-                                   ret.initEvent('unity-webapps-chromium-api-com-link-callback-called-ack', true, false);
-                                   from.dispatchEvent(ret);
-                                 }
-                               }
-                               , true);
-
-    var api = UnityWebappsApiPageProxyBuilder(sendToApi);
-
-    function unity() {
-    }
-    unity.prototype = {
-      __proto__: window.external,
-      getUnityObject: function (version) {
-        console.log ('Proxy: getUnityObject called with version ' + version);
-        if (version === 1)
-          return api;
-        throw new Error("incorrect version");
-      }
-    };
-    window.external = new unity();
-
-    sendApiCreatedAcknowledge();
-  }
-, 0);

=== modified file 'chromium-extension/unity-webapps.json.in'
--- chromium-extension/unity-webapps.json.in	2012-04-30 15:39:21 +0000
+++ chromium-extension/unity-webapps.json.in	2015-01-19 16:40:00 +0000
@@ -1,4 +1,4 @@
 {
-  "external_crx": "@EXTDIR@",
-  "external_version": "@VERSION@"
+  '"external_crx": "$${EXTENSION_DIR}/$${EXTENSION_FILE}"',
+  '"external_version": "$${PROJECT_VERSION}"'
 }

=== removed file 'chromium-extension/unity_api_page_proxy_generator.py'
--- chromium-extension/unity_api_page_proxy_generator.py	2012-06-17 14:33:16 +0000
+++ chromium-extension/unity_api_page_proxy_generator.py	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-#!/usr/bin/python
-
-"""
-Generates a *.js file (defaults to unity-api-page-proxy-builder.js) by parsing & extracting expected
-information out of an input .js filename (defaults to unity-api.js). Extracts only the meaningful bits
-(mostly the argument sanitizer bits) and generates a proper web page side unity api w/ a proper validation
-layer (as exposed by unity-api.js)
-
-Takes an input filename as an argument.
-"""
-
-import sys
-
-class DEFAULTS:
-    input_api_filename = "unity-api.js"
-    output_api_filename = "unity-api-page-proxy-builder-gen-py.js"
-
-input_api_filename = DEFAULTS.input_api_filename
-output_api_filename = DEFAULTS.output_api_filename
-
-def extractFunctionDefinition (name, content):
-    import re
-    funcre = re.compile (r'([^\w_]|\s*)(' + name + r')\s*\((?P<params>.*?)\)\s*{', re.MULTILINE)
-    m = re.search (funcre, content)
-    if m:
-        s = ['{']
-        start = m.end(0)
-        end = start + 1
-        for idx in xrange (start, len(content)-1):
-            if content[idx] == '{':
-                s.append('{')
-            elif content[idx] == '}':
-                s.pop()
-                if s.count('{') == 0:
-                    end = idx
-                    break
-        return m.group('params'), content[start:end]
-    return None, None
-
-def untabify (body):
-    mintabs = min([len([c for c in line if c == ' ' or c == '\t']) for line in body.split('\n') if len(line.strip()) != 0])
-    return '\n'.join ([line[mintabs:] for line in body.split('\n')])
-
-def generateFunction (name, params, body):
-    return """
-var %s = function (%s) {
-  %s
-};
-""" % (name, params, untabify(body))
-
-def extractObjectDefinition(content, oname):
-    import re
-    apire = re.compile(oname + '\s*[=|:]\s*', re.MULTILINE)
-    m = re.search(apire, content)
-    s = []
-    start = m.end(0)
-    end = start
-    for idx in xrange (start, len(content)-1):
-        if content[idx] == '{':
-            s.append('{')
-        elif content[idx] == '}':
-            s.pop()
-            if s.count('{') == 0:
-                end = idx
-                break
-    return content[start:end]
-
-def extractApiDefinition(content):
-    return extractObjectDefinition(content, 'api')
-
-def generateUnityApiTargetFile (inputfilename, outputfilename):
-    content = open(inputfilename).read()
-    function_names = ['findName', 'stringify', 'stringifyArgs', 'createArgumentsSanitaizer']
-    extracted_data = [(function_name, extractFunctionDefinition(function_name, content)) for function_name in function_names]
-    extracted_functions = [{'name': extracted_datum[0], 'params': extracted_datum[1][0], 'body': extracted_datum[1][1]} for extracted_datum in extracted_data]
-
-    buildercontent = 'var UnityWebappsApiPageProxyBuilder = function(backend) {\n'
-    buildercontent += """
-  var dummy = true;
-  var unity = { context: dummy, contextReady: dummy };
-  var uwa = { ContextActionCallbackType: null };
-
-  var CallbackManager = {
-    makeCallback: function (dumd, func) {
-      return func;
-    }
-  };
-"""
-    buildercontent += '\n'.join([generateFunction(func['name'], func['params'], func['body']) for func in extracted_functions])
-    buildercontent += 'var api = {\n};\n'
-    buildercontent += '};\n\n'
-    open(outputfilename, "w+").write(buildercontent)
-
-generateUnityApiTargetFile (input_api_filename, output_api_filename)
-
-

=== added file 'common-project-config.pri'
--- common-project-config.pri	1970-01-01 00:00:00 +0000
+++ common-project-config.pri	2015-01-19 16:40:00 +0000
@@ -0,0 +1,41 @@
+#-----------------------------------------------------------------------------
+# Common configuration for all projects.
+#-----------------------------------------------------------------------------
+
+# we don't like warnings...
+QMAKE_CXXFLAGS += -Werror
+# Disable RTTI
+QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+
+TOP_SRC_DIR = $$PWD
+TOP_BUILD_DIR = $${TOP_SRC_DIR}/$(BUILD_DIR)
+
+include(coverage.pri)
+
+#-----------------------------------------------------------------------------
+# setup the installation prefix
+#-----------------------------------------------------------------------------
+INSTALL_PREFIX = /usr  # default installation prefix
+
+# default prefix can be overriden by defining PREFIX when running qmake
+isEmpty(PREFIX) {
+    message("====")
+    message("==== NOTE: To override the installation path run: `qmake PREFIX=/custom/path'")
+    message("==== (current installation path is `$${INSTALL_PREFIX}')")
+} else {
+    INSTALL_PREFIX = $${PREFIX}
+    message("====")
+    message("==== install prefix set to `$${INSTALL_PREFIX}'")
+}
+
+INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
+
+isEmpty(LIBDIR) {
+    message("====")
+    message("==== NOTE: To override the library installation path run: `qmake LIBDIR=/custom/path'")
+    message("==== (current installation path is `$${INSTALL_LIBDIR}')")
+} else {
+    INSTALL_LIBDIR = $${LIBDIR}
+    message("====")
+    message("==== install prefix set to `$${INSTALL_LIBDIR}'")
+}

=== added file 'common-vars.pri'
--- common-vars.pri	1970-01-01 00:00:00 +0000
+++ common-vars.pri	2015-01-19 16:40:00 +0000
@@ -0,0 +1,6 @@
+#-----------------------------------------------------------------------------
+# Common variables for all projects.
+#-----------------------------------------------------------------------------
+
+PROJECT_NAME = unity_webapps_chromium
+PROJECT_VERSION = 3.2

=== removed file 'configure.ac'
--- configure.ac	2014-03-07 15:22:55 +0000
+++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta application wizard.
-
-AC_INIT(unity_webapps_chromium, 3.1)
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.11])
-AM_SILENT_RULES([yes])
-AC_PROG_CC
-AC_PROG_CC_C99
-AM_PROG_CC_C_O
-
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_DISABLE_STATIC
-LT_INIT
-
-PKG_CHECK_MODULES(UNITY_NPAPI_PLUGIN, [libunity_webapps-0.2 glib-2.0 libnotify libunity-webapps-repository libwnck-1.0])
-
-
-dnl ***************************************************************************
-dnl debug
-dnl ***************************************************************************
-
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging. [default=no]]), [enable_debug="yes"],[enable_debug="no"])
-
-if test "x$enable_debug" = "xyes"; then
-        NPAPI_DEBUG_CFLAGS="-DNPAPI_DEBUG_ENABLED"
-else
-        NPAPI_DEBUG_CFLAGS=""
-fi
-
-AC_SUBST(NPAPI_DEBUG_CFLAGS)
-
-dnl ========== Tests ==========
-
-AC_ARG_ENABLE(tests, AC_HELP_STRING([--enable-tests],
-    [Enable tests. [default=no]]),
-    [enable_tests="yes"], [enable_tests="no"])
-if test "x$enable_tests" = "xyes"; then
-    AC_DEFINE([ENABLE_TESTS], 1, [Enable tests.])
-    # Tests need debug to be enabled
-    enable_debug="yes"
-fi
-AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
-
-dnl ===== gcov coverage reporting =====
-m4_include([m4/gcov.m4])
-AC_TDD_GCOV
-AC_SUBST(UNITY_NPAPI_PLUGIN_COVERAGE_CFLAGS)
-AC_SUBST(UNITY_NPAPI_PLUGIN_COVERAGE_CXXFLAGS)
-AC_SUBST(UNITY_NPAPI_PLUGIN_COVERAGE_LDFLAGS)
-
-AC_OUTPUT([
-Makefile
-chromium-extension/Makefile
-npapi-plugin/src/libunity_npapi_plugin-0.1.pc
-npapi-plugin/Makefile
-npapi-plugin/src/Makefile
-tests/Makefile
-tests/unit/Makefile
-tests/unit/npapi/Makefile
-po/Makefile])

=== added file 'coverage.pri'
--- coverage.pri	1970-01-01 00:00:00 +0000
+++ coverage.pri	2015-01-19 16:40:00 +0000
@@ -0,0 +1,49 @@
+# Coverage
+CONFIG(coverage) {
+    OBJECTS_DIR =
+    MOC_DIR =
+    TOP_SRC_DIR = $$PWD
+
+    LIBS += -lgcov
+    QMAKE_CXXFLAGS += --coverage
+    QMAKE_LDFLAGS += --coverage
+
+    QMAKE_EXTRA_TARGETS += coverage cov
+    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
+        generate-coverage-html clean-coverage-html coverage-gcovr \
+        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+    clean-gcno.commands = \
+        "@echo Removing old coverage instrumentation"; \
+        "find -name '*.gcno' -print | xargs -r rm"
+
+    clean-gcda.commands = \
+        "@echo Removing old coverage results"; \
+        "find -name '*.gcda' -print | xargs -r rm"
+  
+    coverage-html.depends = clean-gcda check generate-coverage-html
+  
+    generate-coverage-html.commands = \
+        "@echo Collecting coverage data"; \
+        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
+        "lcov --extract coverage.info \"*/messaging-host/*.cpp\" -o coverage.info"; \
+        "lcov --remove coverage.info \"moc_*.cpp\" --remove coverage.info \"tests/*.cpp\" -o coverage.info"; \
+        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
+  
+    clean-coverage-html.depends = clean-gcda
+    clean-coverage-html.commands = \
+        "lcov --directory $${TOP_SRC_DIR} -z"; \
+        "rm -rf coverage.info coverage-html"
+
+    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
+
+    generate-coverage-gcovr.commands = \
+        "@echo Generating coverage GCOVR report"; \
+        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
+
+    clean-coverage-gcovr.depends = clean-gcda
+    clean-coverage-gcovr.commands = \
+        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
+
+    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
+}

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-18 20:59:35 +0000
+++ debian/changelog	2015-01-19 16:40:00 +0000
@@ -1,3 +1,13 @@
+unity-chromium-extension (3.2.0+14.10.20140626-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Justin McPherson ]
+  * Support native messaging. (with Alberto Mardegan)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 26 Jun 2014 09:40:22 +0000
+
 unity-chromium-extension (3.0.0+14.04.20140318-0ubuntu1) trusty; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/compat'
--- debian/compat	2012-11-19 22:39:34 +0000
+++ debian/compat	2015-01-19 16:40:00 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2014-03-18 20:50:57 +0000
+++ debian/control	2015-01-19 16:40:00 +0000
@@ -1,22 +1,18 @@
 Source: unity-chromium-extension
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
-# FIXME: We should be using debhelper 9, but that breaks the build
-# for some currently unknown reason.
-Build-Depends: autotools-dev,
-               chromium-browser (>= 20.0.1132.47~r144678-0ubuntu4),
-               debhelper (>= 8),
+Build-Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2),
+               debhelper (>= 9),
                dh-autoreconf,
-               gnome-common,
                libglib2.0-dev,
-               libgtest-dev,
-               libnotify-dev,
                libunity-webapps-dev (>= 1.8.0),
-               libwnck-dev,
                openssl,
                pkg-config,
                vim-common,
                zip,
+               qt5-default,
+               qt5-qmake,
+               xvfb,
 Standards-Version: 3.9.5
 Section: gnome
 Homepage: https://launchpad.net/unity-chromium-extension
@@ -27,7 +23,7 @@
 
 Package: unity-chromium-extension
 Architecture: any
-Depends: chromium-browser (>= 20.0.1132.47~r144678-0ubuntu4),
+Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2),
          unity-webapps-service,
          webbrowser-app,
          ${misc:Depends},

=== modified file 'debian/copyright'
--- debian/copyright	2012-11-19 19:26:58 +0000
+++ debian/copyright	2015-01-19 16:40:00 +0000
@@ -8,48 +8,3 @@
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-Files: npapi-plugin/*
-Copyright: 2012 Canonical Ltd
-License: GPL-2+
-
-Files: npapi-plugin/src/npapi-headers/headers/nptypes.h
-Copyright: 2004 mozilla.org
-License: GPL-2+
-
-Files: npapi-plugin/src/npapi-headers/headers/npapi.h
-       npapi-plugin/src/npapi-headers/headers/npfunctions.h
-Copyright: 1998 Netscape Communications Corporation
-License: GPL-2+
-
-Files: npapi-plugin/src/npapi-headers/headers/npruntime.h
-Copyright: 2004 Apple Computer, Inc.
-License:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
- Foundation ("Mozilla") nor the names of their contributors may be used
- to endorse or promote products derived from this software without
- specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
- THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: GPL-2+
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

=== modified file 'debian/rules'
--- debian/rules	2013-09-20 19:12:01 +0000
+++ debian/rules	2015-01-19 16:40:00 +0000
@@ -4,17 +4,15 @@
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
-
 override_dh_auto_configure:
-	cp debian/unity-webapps.pem .
-	dh_auto_configure -- --enable-tests=yes
+	cp debian/unity-webapps.pem chromium-extension/
+	dh_auto_configure
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
 
 override_dh_install:
-	rm -rf debian/*/usr/lib/*npapi* debian/*/usr/lib/pkgconfig \
-		debian/*/usr/include
 	dh_install --fail-missing
 
 %:
-	dh $@ --with autoreconf --fail-missing
+	dh $@

=== added file 'debian/unity-chromium-extension.install'
--- debian/unity-chromium-extension.install	1970-01-01 00:00:00 +0000
+++ debian/unity-chromium-extension.install	2015-01-19 16:40:00 +0000
@@ -0,0 +1,4 @@
+etc/chromium/native-messaging-hosts/com.canonical.webapp.installer.json
+usr/lib/libunity-chromium/unity-webapps.crx
+usr/share/chromium/extensions/*.json
+usr/share/unity-webapps/bin/unity-webapps-messaging-host

=== removed directory 'm4'
=== removed file 'm4/gcov.m4'
--- m4/gcov.m4	2013-12-23 01:17:40 +0000
+++ m4/gcov.m4	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-# Checks for existence of coverage tools:
-#  * gcov
-#  * lcov
-#  * genhtml
-#  * gcovr
-# 
-# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
-AC_DEFUN([AC_TDD_GCOV],
-[
-  AC_ARG_ENABLE(gcov,
-  AS_HELP_STRING([--enable-gcov],
-		 [enable coverage testing with gcov]),
-  [use_gcov=yes], [use_gcov=no])
-
-  AM_CONDITIONAL(HAVE_GCOV, test "x$use_gcov" = "xyes")
-
-  if test "x$use_gcov" = "xyes"; then
-  # we need gcc:
-  if test "$GCC" != "yes"; then
-    AC_MSG_ERROR([GCC is required for --enable-gcov])
-  fi
-
-  # Check if ccache is being used
-  AC_CHECK_PROG(SHTOOL, shtool, shtool)
-  if test "$SHTOOL"; then
-    AS_CASE([`$SHTOOL path $CC`],
-                [*ccache*], [gcc_ccache=yes],
-                [gcc_ccache=no])
-  fi
-
-  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
-  fi
-
-  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
-  AC_CHECK_PROG(LCOV, lcov, lcov)
-  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
-  if test "$LCOV"; then
-    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
-      glib_cv_lcov_version=invalid
-      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-      for lcov_check_version in $lcov_version_list; do
-        if test "$lcov_version" = "$lcov_check_version"; then
-          glib_cv_lcov_version="$lcov_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-    AC_MSG_ERROR([$lcov_msg])
-  fi
-
-  case $glib_cv_lcov_version in
-    ""|invalid[)]
-      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-      AC_MSG_ERROR([$lcov_msg])
-      LCOV="exit 0;"
-      ;;
-  esac
-
-  if test -z "$GENHTML"; then
-    AC_MSG_ERROR([Could not find genhtml from the lcov package])
-  fi
-
-  # Remove all optimization flags from CFLAGS
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
-  changequote([,])
-
-  # Add the special gcc flags
-  UNITY_NPAPI_PLUGIN_COVERAGE_CFLAGS="--coverage"
-  UNITY_NPAPI_PLUGIN_COVERAGE_CXXFLAGS="--coverage"	
-  UNITY_NPAPI_PLUGIN_COVERAGE_LDFLAGS="-lgcov"
-
-fi
-]) # AC_TDD_GCOV
-

=== added directory 'messaging-host'
=== added file 'messaging-host/Makefile.am'
--- messaging-host/Makefile.am	1970-01-01 00:00:00 +0000
+++ messaging-host/Makefile.am	2015-01-19 16:40:00 +0000
@@ -0,0 +1,2 @@
+EXTRA_DIST += \
+    installation-host                

=== added file 'messaging-host/com.canonical.webapp.installer.json.in'
--- messaging-host/com.canonical.webapp.installer.json.in	1970-01-01 00:00:00 +0000
+++ messaging-host/com.canonical.webapp.installer.json.in	2015-01-19 16:40:00 +0000
@@ -0,0 +1,9 @@
+{
+    '"name": "com.canonical.webapp.installer"',
+    '"description": "Canonical WebApp Installation Host"',
+    '"path": "$${target.path}/$${TARGET}"',
+    '"type": "stdio"',
+    '"allowed_origins"': [
+        '"chrome-extension://pmoflmbbcfgacopiikdcpmbiellfihdg/"'
+    ]
+}

=== added file 'messaging-host/connection.cpp'
--- messaging-host/connection.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/connection.cpp	2015-01-19 16:40:00 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "connection.h"
+
+#include <QByteArray>
+#include <QDebug>
+#include <QFile>
+#include <QJsonDocument>
+#include <QSocketNotifier>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+using namespace UnityWebapps;
+
+namespace UnityWebapps {
+
+class ConnectionPrivate: public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PUBLIC(Connection)
+
+public:
+    inline ConnectionPrivate(Connection *connection);
+    inline ~ConnectionPrivate();
+
+    bool open();
+
+private Q_SLOTS:
+    void onReadyRead();
+
+private:
+    QFile m_readChannel;
+    QFile m_writeChannel;
+    QByteArray m_readBuffer;
+    int m_expectedLength;
+    mutable Connection *q_ptr;
+};
+
+} // namespace
+
+ConnectionPrivate::ConnectionPrivate(Connection *connection):
+    QObject(connection),
+    m_expectedLength(0),
+    q_ptr(connection)
+{
+}
+
+ConnectionPrivate::~ConnectionPrivate()
+{
+}
+
+bool ConnectionPrivate::open()
+{
+    bool ok;
+
+    int flag = fcntl(STDIN_FILENO, F_GETFL);
+    if (Q_UNLIKELY(flag == -1)) return false;
+
+    fcntl(STDIN_FILENO, F_SETFL, flag | O_NONBLOCK);
+
+    ok = m_readChannel.open(stdin, QIODevice::ReadOnly);
+    if (Q_UNLIKELY(!ok)) return false;
+
+    ok = m_writeChannel.open(stdout, QIODevice::WriteOnly);
+    if (Q_UNLIKELY(!ok)) return false;
+
+    QSocketNotifier *notifier = new QSocketNotifier(m_readChannel.handle(),
+                                                    QSocketNotifier::Read,
+                                                    this);
+    QObject::connect(notifier, SIGNAL(activated(int)),
+                     this, SLOT(onReadyRead()));
+
+    // There might be already something to read
+    onReadyRead();
+
+    return true;
+}
+
+void ConnectionPrivate::onReadyRead()
+{
+    Q_Q(Connection);
+
+    while (true) {
+        if (m_expectedLength == 0) {
+            /* We are beginning a new read */
+
+            quint32 length;
+            int bytesRead = m_readChannel.read((char *)&length,
+                                               sizeof(length));
+            if (bytesRead < int(sizeof(length))) break;
+            m_expectedLength = length;
+            m_readBuffer.clear();
+        }
+
+        int neededBytes = m_expectedLength - m_readBuffer.length();
+        QByteArray buffer = m_readChannel.read(neededBytes);
+        m_readBuffer += buffer;
+        if (buffer.length() < neededBytes) break;
+        if (m_readBuffer.length() == m_expectedLength) {
+            QJsonDocument doc = QJsonDocument::fromJson(m_readBuffer);
+            Q_EMIT q->messageReceived(doc.toVariant().toMap());
+            m_expectedLength = 0;
+        }
+    }
+}
+
+Connection::Connection(QObject *parent):
+    QObject(parent),
+    d_ptr(new ConnectionPrivate(this))
+{
+}
+
+Connection::~Connection()
+{
+}
+
+bool Connection::open()
+{
+    Q_D(Connection);
+    return d->open();
+}
+
+void Connection::postMessage(const QVariantMap &message)
+{
+    Q_D(Connection);
+
+    QJsonDocument doc = QJsonDocument::fromVariant(message);
+    QByteArray json = doc.toJson();
+    quint32 length = json.length();
+    d->m_writeChannel.write((char *)&length, sizeof(length));
+    d->m_writeChannel.write(json);
+    d->m_writeChannel.flush();
+}
+
+#include "connection.moc"

=== added file 'messaging-host/connection.h'
--- messaging-host/connection.h	1970-01-01 00:00:00 +0000
+++ messaging-host/connection.h	2015-01-19 16:40:00 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_WEBAPPS_CONNECTION
+#define UNITY_WEBAPPS_CONNECTION
+
+#include <QObject>
+#include <QVariantMap>
+
+namespace UnityWebapps {
+
+class ConnectionPrivate;
+
+class Connection: public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit Connection(QObject *parent = 0);
+    ~Connection();
+
+    bool open();
+
+public Q_SLOTS:
+    void postMessage(const QVariantMap &message);
+
+Q_SIGNALS:
+    void messageReceived(const QVariantMap &message);
+
+private:
+    ConnectionPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(Connection)
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_CONNECTION

=== added file 'messaging-host/inactivity-timer.cpp'
--- messaging-host/inactivity-timer.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/inactivity-timer.cpp	2015-01-19 16:40:00 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "inactivity-timer.h"
+
+#include <QVariant>
+
+using namespace UnityWebapps;
+
+InactivityTimer::InactivityTimer(int interval, QObject *parent):
+    QObject(parent),
+    m_interval(interval)
+{
+    m_timer.setSingleShot(true);
+    QObject::connect(&m_timer, SIGNAL(timeout()),
+                     this, SLOT(onTimeout()));
+}
+
+void InactivityTimer::watchObject(QObject *object)
+{
+    connect(object, SIGNAL(isIdleChanged()), SLOT(onIdleChanged()));
+    m_watchedObjects.append(object);
+
+    /* Force an initial check */
+    onIdleChanged();
+}
+
+void InactivityTimer::onIdleChanged()
+{
+    if (allObjectsAreIdle()) {
+        m_timer.start(m_interval);
+    }
+}
+
+void InactivityTimer::onTimeout()
+{
+    if (allObjectsAreIdle()) {
+        Q_EMIT timeout();
+    }
+}
+
+bool InactivityTimer::allObjectsAreIdle() const
+{
+    foreach (const QObject *object, m_watchedObjects) {
+        if (!object->property("isIdle").toBool()) {
+            return false;
+        }
+    }
+    return true;
+}

=== added file 'messaging-host/inactivity-timer.h'
--- messaging-host/inactivity-timer.h	1970-01-01 00:00:00 +0000
+++ messaging-host/inactivity-timer.h	2015-01-19 16:40:00 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_WEBAPPS_INACTIVITY_TIMER_H
+#define UNITY_WEBAPPS_INACTIVITY_TIMER_H
+
+#include <QList>
+#include <QObject>
+#include <QTimer>
+
+namespace UnityWebapps {
+
+class InactivityTimer: public QObject
+{
+    Q_OBJECT
+
+public:
+    InactivityTimer(int interval, QObject *parent = 0);
+    ~InactivityTimer() {}
+
+    void watchObject(QObject *object);
+
+Q_SIGNALS:
+    void timeout();
+
+private Q_SLOTS:
+    void onIdleChanged();
+    void onTimeout();
+
+private:
+    bool allObjectsAreIdle() const;
+
+private:
+    QList<QObject*> m_watchedObjects;
+    QTimer m_timer;
+    int m_interval;
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_INACTIVITY_TIMER_H

=== added file 'messaging-host/main.cpp'
--- messaging-host/main.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/main.cpp	2015-01-19 16:40:00 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <syslog.h>
+
+#include "connection.h"
+#include "inactivity-timer.h"
+#include "service.h"
+#include "webapps-handler.h"
+#include "webapps-process.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+
+
+void syslogOutputHandler(QtMsgType type, const QMessageLogContext &, const QString &msg)
+{
+    QByteArray localMsg = msg.toLocal8Bit();
+    int syslog_type = LOG_USER;
+    switch (type) {
+    case QtDebugMsg:
+        syslog_type |= LOG_DEBUG;
+        break;
+    case QtWarningMsg:
+        syslog_type |= LOG_WARNING;
+        break;
+    case QtCriticalMsg:
+        syslog_type |= LOG_CRIT;
+        break;
+    case QtFatalMsg:
+        syslog_type |= LOG_ERR;
+        break;
+    }
+
+    syslog(syslog_type, "%s", localMsg.constData());
+}
+
+
+int main(int argc, char **argv)
+{
+    if (qgetenv("UNITY_WEBAPPS_LOGGING") == QByteArrayLiteral("1")) {
+        qInstallMessageHandler(syslogOutputHandler);
+    }
+
+    qDebug() << "Starting";
+
+    QCoreApplication app(argc, argv);
+
+    UnityWebapps::Process process;
+
+    UnityWebapps::Service service;
+    UnityWebapps::WebappsHandler handler;
+    service.addHandler(&handler);
+
+    UnityWebapps::InactivityTimer inactivityTimer(2 * 60 * 1000);
+    QObject::connect(&inactivityTimer, SIGNAL(timeout()), &app, SLOT(quit()));
+    inactivityTimer.watchObject(&service);
+
+    UnityWebapps::Connection connection;
+    QObject::connect(&connection, SIGNAL(messageReceived(const QVariantMap &)),
+                     &service, SLOT(handleMessage(const QVariantMap &)));
+    QObject::connect(&service, SIGNAL(messageHandled(const QVariantMap &)),
+                     &connection, SLOT(postMessage(const QVariantMap &)));
+    bool ok = connection.open();
+    if (Q_UNLIKELY(!ok)) {
+        qCritical() << "Couldn't open connection";
+        return EXIT_FAILURE;
+    }
+
+    int r = app.exec();
+
+    qDebug() << "Finishing";
+
+    return r;
+}
+

=== added file 'messaging-host/messaging-host.pro'
--- messaging-host/messaging-host.pro	1970-01-01 00:00:00 +0000
+++ messaging-host/messaging-host.pro	2015-01-19 16:40:00 +0000
@@ -0,0 +1,42 @@
+include(../common-project-config.pri)
+
+TEMPLATE = app
+TARGET = unity-webapps-messaging-host
+
+CONFIG += \
+    link_pkgconfig \
+    qt
+
+QT += \
+    core
+
+PKGCONFIG += \
+    glib-2.0 \
+    gobject-2.0 \
+    libunity_webapps-0.2 \
+    libunity-webapps-repository \
+
+SOURCES = \
+    connection.cpp \
+    inactivity-timer.cpp \
+    main.cpp \
+    service.cpp \
+    webapps-handler.cpp \
+    webapps-process.cpp \
+
+HEADERS = \
+    connection.h \
+    inactivity-timer.h \
+    service.h \
+    webapps-handler.h \
+    webapps-process.h \
+
+target.path = $${INSTALL_PREFIX}/share/unity-webapps/bin
+INSTALLS += target
+
+QMAKE_SUBSTITUTES += \
+    com.canonical.webapp.installer.json.in
+
+manifest.path = "/etc/chromium/native-messaging-hosts"
+manifest.files = com.canonical.webapp.installer.json
+INSTALLS += manifest

=== added file 'messaging-host/service.cpp'
--- messaging-host/service.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/service.cpp	2015-01-19 16:40:00 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "service.h"
+
+#include <QDebug>
+#include <QList>
+#include <QMetaMethod>
+#include <QMetaObject>
+
+using namespace UnityWebapps;
+
+namespace UnityWebapps {
+
+class ServicePrivate
+{
+    Q_DECLARE_PUBLIC(Service)
+
+public:
+    inline ServicePrivate(Service *service);
+    inline ~ServicePrivate();
+
+    void setIdle(bool isIdle);
+
+private:
+    QList<QObject *> m_handlers;
+    bool m_isIdle;
+    mutable Service *q_ptr;
+};
+
+} // namespace
+
+ServicePrivate::ServicePrivate(Service *service):
+    m_isIdle(true),
+    q_ptr(service)
+{
+}
+
+ServicePrivate::~ServicePrivate()
+{
+}
+
+void ServicePrivate::setIdle(bool isIdle)
+{
+    Q_Q(Service);
+
+    if (m_isIdle == isIdle) return;
+    m_isIdle = isIdle;
+    Q_EMIT q->isIdleChanged();
+}
+
+Service::Service(QObject *parent):
+    QObject(parent),
+    d_ptr(new ServicePrivate(this))
+{
+}
+
+Service::~Service()
+{
+    delete d_ptr;
+}
+
+bool Service::isIdle() const {
+    Q_D(const Service);
+    return d->m_isIdle;
+}
+
+void Service::addHandler(QObject *handler)
+{
+    Q_D(Service);
+
+    d->m_handlers.append(handler);
+}
+
+void Service::handleMessage(const QVariantMap &message)
+{
+    Q_D(Service);
+
+    QByteArray method = message.value(QStringLiteral("method")).toString().toLatin1();
+    if (Q_UNLIKELY(method.isEmpty())) return;
+
+    QByteArray methodSignature = method + "(QVariantMap)";
+
+    d->setIdle(false);
+
+    QVariantMap reply;
+    bool ok = false;
+    Q_FOREACH(QObject *handler, d->m_handlers) {
+        const QMetaObject *metaObject = handler->metaObject();
+        int index = metaObject->indexOfMethod(methodSignature);
+        if (index == -1) continue;
+
+        QMetaMethod metaMethod = metaObject->method(index);
+        ok = metaMethod.invoke(handler,
+                               Q_RETURN_ARG(QVariantMap, reply),
+                               Q_ARG(QVariantMap, message));
+        if (ok) break;
+    }
+
+    if (ok) {
+        Q_EMIT messageHandled(reply);
+    }
+
+    d->setIdle(true);
+}

=== added file 'messaging-host/service.h'
--- messaging-host/service.h	1970-01-01 00:00:00 +0000
+++ messaging-host/service.h	2015-01-19 16:40:00 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_WEBAPPS_SERVICE
+#define UNITY_WEBAPPS_SERVICE
+
+#include <QObject>
+#include <QVariantMap>
+
+namespace UnityWebapps {
+
+class ServicePrivate;
+
+class Service: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isIdle READ isIdle NOTIFY isIdleChanged)
+
+public:
+    explicit Service(QObject *parent = 0);
+    ~Service();
+
+    bool isIdle() const;
+
+    void addHandler(QObject *handler);
+
+public Q_SLOTS:
+    void handleMessage(const QVariantMap &message);
+
+Q_SIGNALS:
+    void messageHandled(const QVariantMap &reply);
+    void isIdleChanged();
+
+private:
+    ServicePrivate *d_ptr;
+    Q_DECLARE_PRIVATE(Service)
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_SERVICE

=== added file 'messaging-host/webapps-handler.cpp'
--- messaging-host/webapps-handler.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/webapps-handler.cpp	2015-01-19 16:40:00 +0000
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+extern "C" {
+#include <unity-webapps-permissions.h>
+#include <unity-webapps-application-repository.h>
+}
+
+#include "webapps-handler.h"
+
+#include <QDebug>
+#include <QRegularExpression>
+
+
+using namespace UnityWebapps;
+
+namespace UnityWebapps {
+
+class WebappsHandlerPrivate
+{
+    Q_DECLARE_PUBLIC(WebappsHandler)
+
+public:
+    inline WebappsHandlerPrivate(WebappsHandler *service);
+    inline ~WebappsHandlerPrivate();
+
+    UnityWebappsApplicationRepository *getRepository();
+
+private:
+    static
+    void installationCallback(UnityWebappsApplicationRepository *repository,
+                              const gchar *name,
+                              UnityWebappsApplicationStatus status,
+                              gpointer user_data);
+
+    mutable WebappsHandler *q_ptr;
+    UnityWebappsApplicationRepository *applicationRepository;
+};
+
+} // namespace
+
+
+WebappsHandlerPrivate::WebappsHandlerPrivate(WebappsHandler *service):
+    q_ptr(service),
+    applicationRepository(0)
+{
+}
+
+WebappsHandlerPrivate::~WebappsHandlerPrivate()
+{
+    if (applicationRepository != 0) {
+        g_object_unref(G_OBJECT(applicationRepository));
+    }
+}
+
+UnityWebappsApplicationRepository *WebappsHandlerPrivate::getRepository()
+{
+    if (applicationRepository == 0) {
+        applicationRepository = unity_webapps_application_repository_new_default();
+        unity_webapps_application_repository_prepare(applicationRepository);
+    }
+    return applicationRepository;
+}
+
+void WebappsHandlerPrivate::installationCallback(
+    UnityWebappsApplicationRepository *repository,
+    const gchar *name,
+    UnityWebappsApplicationStatus status,
+    gpointer user_data
+)
+{
+    Q_UNUSED(repository);
+    Q_UNUSED(name);
+    Q_UNUSED(status);
+    Q_UNUSED(user_data);
+}
+
+
+WebappsHandler::WebappsHandler(QObject *parent):
+    QObject(parent),
+    d_ptr(new WebappsHandlerPrivate(this))
+{
+}
+
+WebappsHandler::~WebappsHandler()
+{
+    delete d_ptr;
+}
+
+QVariantMap WebappsHandler::url_loaded(const QVariantMap &message)
+{
+    Q_D(WebappsHandler);
+
+    QVariantMap reply;
+
+    if (!message.contains("url")) {
+        reply.insert("error", QStringLiteral("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *apps = unity_webapps_application_repository_resolve_url(
+                    d->getRepository(),
+                    url.toLocal8Bit().constData()
+                  );
+
+    if (apps == 0) {
+        reply.insert("available", false);
+        return reply;
+    }
+
+    // As per original extension only look at the first entry
+    const gchar *packageName = (const gchar*)apps->data;
+    UnityWebappsApplicationStatus status = unity_webapps_application_repository_get_resolved_application_status(
+                d->getRepository(),
+                packageName);
+
+    if (status == UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED) {
+        reply.insert("available", false);
+        g_list_free_full(apps, g_free);
+        return reply;
+    }
+
+    const gchar *appName = unity_webapps_application_repository_get_resolved_application_name(
+                        d->getRepository(),
+                        packageName);
+
+    const gchar *appDomain = unity_webapps_application_repository_get_resolved_application_domain(
+                        d->getRepository(),
+                        packageName);
+
+    if (unity_webapps_permissions_get_domain_dontask(appDomain) ||
+        unity_webapps_permissions_get_domain_allowed(appDomain)) {
+        reply.insert("available", false);
+        g_list_free_full(apps, g_free);
+        return reply;
+    }
+
+    reply.insert("available", true);
+    reply.insert("appName", QString::fromUtf8(appName));
+    reply.insert("appDomain", QString::fromUtf8(appDomain));
+
+    g_list_free_full(apps, g_free);
+
+    return reply;
+}
+
+QVariantMap WebappsHandler::dont_ask(const QVariantMap &message)
+{
+    Q_D(WebappsHandler);
+
+    QVariantMap reply;
+
+    if (!message.contains("url")) {
+        reply.insert("error", QLatin1String("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *apps = unity_webapps_application_repository_resolve_url(
+                    d->getRepository(),
+                    url.toLocal8Bit().constData()
+                  );
+
+    if (apps == 0) {
+        reply.insert("available", false);
+        reply.insert("dont_ask", false);
+        return reply;
+    }
+
+    const gchar *packageName = (const gchar*)apps->data;
+
+    const gchar *appDomain = unity_webapps_application_repository_get_resolved_application_domain(
+                        d->getRepository(),
+                        packageName);
+
+    unity_webapps_permissions_dontask_domain(appDomain);
+
+    reply.insert("dont_ask", true);
+
+    g_list_free_full(apps, g_free);
+
+    return reply;
+}
+
+QVariantMap WebappsHandler::install(const QVariantMap &message)
+{
+    Q_D(WebappsHandler);
+
+    QVariantMap reply;
+
+    if (!message.contains("url")) {
+        reply.insert("error", QLatin1String("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *apps = unity_webapps_application_repository_resolve_url(
+                    d->getRepository(),
+                    url.toLocal8Bit().constData()
+                  );
+
+    if (apps == 0) {
+        reply.insert("available", false);
+        reply.insert("installed", false);
+        return reply;
+    }
+
+    const gchar *packageName = (const gchar*)apps->data;
+
+    UnityWebappsApplicationStatus status = unity_webapps_application_repository_get_resolved_application_status(
+                d->getRepository(),
+                packageName);
+
+    if (status == UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED) {
+        reply.insert("available", false);
+        reply.insert("installed", false);
+        g_list_free_full(apps, g_free);
+        return reply;
+    }
+
+    const gchar *appDomain = unity_webapps_application_repository_get_resolved_application_domain(
+                        d->getRepository(),
+                        packageName);
+    const gchar *appName = unity_webapps_application_repository_get_resolved_application_name(
+                        d->getRepository(),
+                        packageName);
+
+    switch (status) {
+    case UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE:
+        if (unity_webapps_permissions_get_domain_dontask(appDomain)) {
+            reply.insert("available", true);
+            reply.insert("installed", false);
+            g_list_free_full(apps, g_free);
+            return reply;
+        }
+        unity_webapps_permissions_allow_domain(appDomain);
+        unity_webapps_application_repository_install_application(
+            d->getRepository(),
+            packageName,
+            WebappsHandlerPrivate::installationCallback,
+            0);
+        break;
+
+    case UNITY_WEBAPPS_APPLICATION_STATUS_INSTALLED:
+        if (unity_webapps_permissions_get_domain_dontask(appDomain) ||
+            unity_webapps_permissions_get_domain_allowed(appDomain)) {
+            reply.insert("available", true);
+            reply.insert("installed", true);
+            g_list_free_full(apps, g_free);
+            return reply;
+        }
+        unity_webapps_application_repository_add_desktop_to_launcher(
+                createApplicationDesktopName(appName, appDomain).toLocal8Bit()
+            );
+        unity_webapps_permissions_allow_domain(appDomain);
+        break;
+    case UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED:
+        // handled above
+        break;
+    }
+
+    reply.insert("installed", true);
+
+    g_list_free_full(apps, g_free);
+
+    return reply;
+}
+
+QVariantMap WebappsHandler::ping(const QVariantMap &message)
+{
+    Q_UNUSED(message);
+
+    QVariantMap reply;
+
+    reply.insert("pong", QLatin1String("alive"));
+
+    return reply;
+}
+
+/*
+    \fn createApplicationDesktopName(QString, QString)
+
+    This function creates a application:// URI suitable for passing to
+    unity_webapps_application_repository_add_desktop_to_launcher().
+
+    To add the webapp's icon to the launcher, a dbus message is sent to the
+    launcher, referencing the webapps canonical .desktop file name. This
+    function creates the canonical name and returns it in the URI form.
+*/
+
+QString WebappsHandler::createApplicationDesktopName(
+    const QString &appName,
+    const QString &appDomain
+) const
+{
+    QString basename;
+    QRegularExpression re(QStringLiteral("[^[:alnum:]]"),
+                            QRegularExpression::UseUnicodePropertiesOption);
+
+    basename.append(appName.trimmed().replace(re, QStringLiteral("")));
+    basename.append(appDomain.trimmed().replace(re, QStringLiteral("")));
+
+    return QStringLiteral("application://%1.desktop").arg(basename);
+}
+

=== added file 'messaging-host/webapps-handler.h'
--- messaging-host/webapps-handler.h	1970-01-01 00:00:00 +0000
+++ messaging-host/webapps-handler.h	2015-01-19 16:40:00 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_WEBAPPS_WEBAPPS_HANDLER
+#define UNITY_WEBAPPS_WEBAPPS_HANDLER
+
+#include <QObject>
+#include <QVariantMap>
+
+namespace UnityWebapps {
+
+class WebappsHandlerPrivate;
+
+class WebappsHandler: public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit WebappsHandler(QObject *parent = 0);
+    ~WebappsHandler();
+
+public Q_SLOTS:
+    QVariantMap url_loaded(const QVariantMap &message);
+    QVariantMap dont_ask(const QVariantMap &message);
+    QVariantMap install(const QVariantMap &message);
+    QVariantMap ping(const QVariantMap &message);
+
+#if defined(UCX_UNDER_TEST)
+public:
+#else
+private:
+#endif
+    QString createApplicationDesktopName(
+            const QString &appName,
+            const QString &appDomain
+        ) const;
+
+    WebappsHandlerPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(WebappsHandler)
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_WEBAPPS_HANDLER

=== added file 'messaging-host/webapps-process.cpp'
--- messaging-host/webapps-process.cpp	1970-01-01 00:00:00 +0000
+++ messaging-host/webapps-process.cpp	2015-01-19 16:40:00 +0000
@@ -0,0 +1,28 @@
+
+extern "C" {
+#include <unity-webapps-service.h>
+}
+
+#include "webapps-process.h"
+
+namespace UnityWebapps {
+
+class ProcessPrivate
+{
+public:
+    UnityWebappsService *service;
+};
+
+Process::Process():
+    d_ptr(new ProcessPrivate)
+{
+    d_ptr->service = unity_webapps_service_new();
+}
+
+Process::~Process()
+{
+    g_object_unref(d_ptr->service);
+    delete d_ptr;
+}
+
+}

=== added file 'messaging-host/webapps-process.h'
--- messaging-host/webapps-process.h	1970-01-01 00:00:00 +0000
+++ messaging-host/webapps-process.h	2015-01-19 16:40:00 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_WEBAPPS_PROCESS
+#define UNITY_WEBAPPS_PROCESS
+
+namespace UnityWebapps {
+
+class ProcessPrivate;
+class Process
+{
+public:
+    Process();
+    ~Process();
+
+private:
+    ProcessPrivate *d_ptr;
+};
+
+} // namespace
+
+#endif // UNITY_WEBAPPS_SERVICE

=== removed directory 'npapi-binding-gen'
=== removed file 'npapi-binding-gen/bindinggen.py'
--- npapi-binding-gen/bindinggen.py	2012-07-17 19:22:35 +0000
+++ npapi-binding-gen/bindinggen.py	1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-import sys
-import os
-try:
-    import headers
-    import parser
-except Exception, e:
-    print e
-    sys.exit(1)
-
-def _get_candidates_for_header_file_gen (files):
-    """
-    Takes a list of files (header files) and returns a list of files
-    that should  be considered for "webapps binding" generation
-    """
-    candidates = [file for file in files if file.endswith('-context.h')
-                  and -1 == file.find('-gen-')
-                  or file.endswith('webapps-service.h')
-                  or file.endswith('script-repo.h')]
-    return candidates
-
-def _get_source_file_body_template ():
-    return """
-/*
- * unity-webapps-binding.c
- * Copyright (C) Canonical LTD 2012
- * 
- * Author: Alexandre Abreu <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY 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 with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <glib.h>
-
-#include <unity-webapps-service.h>
-#include <unity-webapps-context.h>
-#include <unity-webapps-music-player-context.h>
-#include <unity-webapps-permissions.h>
-#include <unity-webapps-launcher-context.h>
-#include <unity-webapps-notification-context.h>
-
-#include "npapi-headers/headers/npapi.h"
-#include "npapi-headers/headers/npfunctions.h"
-#include "npapi-headers/headers/npruntime.h"
-
-#include "wrapped-ptr-type.h"
-#include "wrapped-callback-type.h"
-#include "unity-webapps-binding-test.h"
-#include "unity-npapi-binding-utils.h"
-#include "unity-webapps-scriptable-object.h"
-#include "unity-webapps-repo-userscript-wrapper.h"
-#include "unity-npapi-plugin.h"
-
-#define REACHED_UNITY_WEBAPPS_FUNC_CALL() \
-    if (unity_webapps_binding_test_is_test_mode_on()) \
-    { \
-    g_message("reached func call"); \
-    unity_webapps_binding_test_reached_func_call ();    \
-    return result;  \
-    } \
-    do {} while (false)
-
-#define ADD_NPOBJECT_RETAIN_FOR_CONTEXT(npp,context,object) \
-  if (! unity_webapps_binding_test_is_test_mode_on()) \
-  { \
-    unity_npapi_plugin_t * pPlugin = (unity_npapi_plugin_t *) npp->pdata; \
-    if (NULL != pPlugin) \
-      { \
-        unity_npapi_add_retained_objects_for_context (pPlugin,context,object); \
-      } \
-  }
-
-"""
-
-def _get_header_body_template ():
-    return """
-/*
- * Copyright (C) Canonical LTD 2012
- * 
- * Author: Alexandre Abreu <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY 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 with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#if ! defined (UNITY_WEBAPPS_BINDING_H)
-#define UNITY_WEBAPPS_BINDING_H
-
-#include "npapi-headers/headers/npapi.h"
-#include "npapi-headers/headers/nptypes.h"
-
-%s
-
-#endif // UNITY_WEBAPPS_BINDING_H
-
-"""
-
-def _get_unittest_func_header_template():
-    return """ #ifndef %s_TEST_H
-#define %s_TEST_H
-
-int %s_test(void);
-
-#endif
-"""
-
-def _get_function_defs (parsed_data):
-    return [parsed_datum for parsed_datum in parsed_data if parsed_datum['type'] == 'func_decl']
-
-def _get_callback_typedefs (parsed_data):
-    return [parsed_datum for parsed_datum in parsed_data if parsed_datum['type'] == 'func_typedef' and parsed_datum['name'][1].endswith('Callback')]
-
-if __name__ == "__main__":
-    import sys
-
-    import argparse
-    parser = argparse.ArgumentParser(description='Generate NPAPI binding from header files.')
-    parser.add_argument ('--outf', default='unity-webapps-npapi-binding')
-    parser.add_argument ('--inf')
-    args = parser.parse_args()
-    
-    outfilename = args.outf
-    infilename = args.inf
-
-    header_content = "// this file has been generated\n\n"
-    source_content = "// this file has been generated\n\n" + _get_source_file_body_template()
-    
-    binding_headers = []
-    if infilename is not None:
-        import os
-        if  not os.path.exists(infilename):
-            print "Invalid filename (does not exist):", infilename
-            sys.exit(1)
-        infilename = os.path.normpath (infilename)
-        binding_headers = [infilename]
-    else:
-        header_file_path = headers.getLibHeaderFilesPath()
-        if not os.path.exists(header_file_path):
-            print "libunity-webapps not installed or found"
-            sys.exit(1)
-        
-        binding_headers = _get_candidates_for_header_file_gen (headers.getHeaderFilesFrom (header_file_path))
-        if len(binding_headers) == 0:
-            print "nothing to do, no header found"
-            sys.exit(1)
-        
-        # 'fix' the paths
-        binding_headers = [os.path.join (header_file_path, binding_header) for binding_header in binding_headers]
-
-    import common_gen
-    import subprocess
-    functions_to_generate = [common_gen.get_unity_webapps_function_prefix() + function_to_generate for function_to_generate in subprocess.check_output('./get_functions_to_generate.sh', shell=True).split()]
-
-    import header_generator
-    import source_generator
-    import unittest_gen
-
-    import prepasses
-    import parser
-    for binding_header in binding_headers:
-        print "--- processing", binding_header
-        parsed_data = parser.parse (prepasses.run_prepasses(open(binding_header).read()))
-        
-        callback_decls = _get_callback_typedefs (parsed_data)
-        func_decls = _get_function_defs (parsed_data)
-        
-        # filter func defs
-        func_decls = [func_decl for func_decl in func_decls if func_decl['name'][1] in functions_to_generate]
-
-        # generate
-        header_content += header_generator.generate_headers_for(func_decls)
-        source_content += source_generator.generate_sources_for(func_decls, callback_decls)
-        
-        for func_decl in func_decls:
-            unittest_content = unittest_gen.generate_unittest_for(func_decl)
-            func_name = func_decl['name'][1]
-            func_name_filename = func_name.replace('_', '-')
-            open(func_name_filename + "-test.c", "w+").write(unittest_content)
-            open(func_name_filename + "-test.h", "w+").write(_get_unittest_func_header_template() % (func_name.upper(), func_name.upper(), func_name))
-    
-    open(outfilename + '.h', 'w+').write (_get_header_body_template() % header_content)
-    open(outfilename + '.c', 'w+').write (source_content)
-
-

=== removed file 'npapi-binding-gen/common_gen.py'
--- npapi-binding-gen/common_gen.py	2012-06-04 14:04:32 +0000
+++ npapi-binding-gen/common_gen.py	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-"""
-"""
-
-def get_binding_function_prefix ():
-    return "unity_webapps_binding_"
-
-def get_unity_webapps_function_prefix ():
-    return "unity_webapps_"
-

=== removed file 'npapi-binding-gen/get_functions_to_generate.sh'
--- npapi-binding-gen/get_functions_to_generate.sh	2012-06-04 14:04:32 +0000
+++ npapi-binding-gen/get_functions_to_generate.sh	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-find ../chromium-extension -name *.js | xargs grep -Po "(uwa\.[\w_]*)" | awk -F":" '{ print $2 }' | awk -F"." '{print $2}' | tee functions_to_generate | cat
-

=== removed file 'npapi-binding-gen/header_generator.py'
--- npapi-binding-gen/header_generator.py	2012-06-04 14:04:32 +0000
+++ npapi-binding-gen/header_generator.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-"""
-"""
-
-import common_gen
-
-def generate_headers_for(func_descriptions):
-    func_decls = []
-    for func_description in [func_description for func_description in func_descriptions if func_description['type'] == 'func_decl']:
-        func_decls.append(_generate_header_for(func_description))
-    return '\n'.join (func_decls)
-
-
-def _generate_header_for(func_description):
-    return """
-NPVariant
-%s%s (NPP instance
-         , NPObject * npobject
-         , const NPVariant *args
-         , uint32_t argCount);
-""" % (common_gen.get_binding_function_prefix (), func_description['name'][1].replace(common_gen.get_unity_webapps_function_prefix(), ''))
-
-
-