Merge lp://qastaging/~justinmcp/unity-chromium-extension/webapps-extension into lp://qastaging/unity-chromium-extension
Proposed by
David Barth
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~justinmcp/unity-chromium-extension/webapps-extension |
| Merge into: | lp://qastaging/unity-chromium-extension |
| Diff against target: |
3605 lines (+3408/-0) (has conflicts) 38 files modified
CMakeLists.txt (+24/-0) COPYING (+674/-0) debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+32/-0) debian/copyright (+10/-0) debian/rules (+18/-0) debian/unity-webapps.pem (+15/-0) debian/webapps-extension.install (+4/-0) src/CMakeLists.txt (+63/-0) src/click-handler.cpp (+398/-0) src/click-handler.h (+56/-0) src/com.canonical.webapp.installer.json.in (+9/-0) src/connection.cpp (+152/-0) src/connection.h (+52/-0) src/inactivity-timer.cpp (+65/-0) src/inactivity-timer.h (+56/-0) src/main.cpp (+101/-0) src/service-handler.cpp (+75/-0) src/service-handler.h (+54/-0) src/service.cpp (+127/-0) src/service.h (+56/-0) src/webapps-handler.cpp (+329/-0) src/webapps-handler.h (+59/-0) tests/CMakeLists.txt (+2/-0) tests/unit/connection-host.cpp (+71/-0) tests/unit/messaging-host.pri (+9/-0) tests/unit/messaging-host.pro (+12/-0) tests/unit/tst_connection.cpp (+112/-0) tests/unit/tst_connection.pro (+14/-0) tests/unit/tst_connection_host.pro (+14/-0) tests/unit/tst_inactivity_timer.cpp (+125/-0) tests/unit/tst_inactivity_timer.pro (+18/-0) tests/unit/tst_service.cpp (+189/-0) tests/unit/tst_service.pro (+18/-0) tests/unit/tst_webapps-handler.cpp (+354/-0) tests/unit/tst_webapps-handler.pro (+32/-0) tests/unit/unit.pro (+3/-0) Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file tests. Moved existing file to tests.moved. |
| To merge this branch: | bzr merge lp://qastaging/~justinmcp/unity-chromium-extension/webapps-extension |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| WebApps | Pending | ||
|
Review via email:
|
|||
Description of the change
For a given URL, verifies if a web application (click) exists and is installed
To post a comment you must log in.
Unmerged revisions
- 6. By Justin McPherson
-
WIP
- 5. By Justin McPherson
-
WIP
- 4. By Justin McPherson
-
WIP
- 3. By Justin McPherson
-
WIP
- 2. By Justin McPherson
-
WIP
- 1. By Justin McPherson
-
start
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
