Merge lp:~abreu-alexandre/webbrowser-app/add-to-homescreen into lp:webbrowser-app

[Alexandre Abreu]

very much a WIP

very much a WIP

[lp:~abreu-alexandre/webbrowser-app/add-to-homescreen]

967. By Launchpad Translations on behalf of phablet-team on 2015-04-15

Launchpad automatic translations update.

968. By Arthur Mello on 2015-04-16

Add model support to control which history entries will be displayed based on a blacklist database
Approved by: PS Jenkins bot, Olivier Tilloy

969. By Arthur Mello on 2015-04-16

Make Top Sites format equal to Bookmarks on the New Tab view
Approved by: PS Jenkins bot

970. By CI Train Bot Account on 2015-04-16

Releasing 0.23+15.04.20150416-0ubuntu1

971. By CI Train Bot Account on 2015-04-21

Resync trunk.

972. By Launchpad Translations on behalf of phablet-team on 2015-04-22

Launchpad automatic translations update.

973. By Ugo Riboni on 2015-04-22

Include bookmark results in the suggestions list Fixes: #1351177
Approved by: Olivier Tilloy, PS Jenkins bot

974. By Alexandre Abreu on 2015-04-22

Add missing reload button from the webapp container as specified in the design document.
Approved by: Olivier Tilloy, PS Jenkins bot

975. By Ken VanDine on 2015-04-22

added ShareLink to contextualActions

Approved by: Olivier Tilloy, PS Jenkins bot

976. By Olivier Tilloy on 2015-04-22

Save the updated homepage when pressing return. Fixes: #1441874
Approved by: PS Jenkins bot, Riccardo Padovani

977. By Leo Arias on 2015-04-22

In the autopilot tests, removed the extra focus step to write a URL. Fixes: #1441551
Approved by: Olivier Tilloy, PS Jenkins bot

978. By Olivier Tilloy on 2015-04-22

Always exit fullscreen mode when the application becomes inactive. Fixes: #1331475
Approved by: PS Jenkins bot, Bill Filler

979. By Olivier Tilloy on 2015-04-22

Recognize about:blank as a valid URL. Fixes: #1444139
Approved by: PS Jenkins bot

980. By CI Train Bot Account on 2015-04-22

Releasing 0.23+15.04.20150422.1-0ubuntu1

981. By CI Train Bot Account on 2015-04-24

Resync trunk.

982. By Olivier Tilloy on 2015-04-24

Update translation template.

983. By Launchpad Translations on behalf of phablet-team on 2015-04-25

Launchpad automatic translations update.

984. By Launchpad Translations on behalf of phablet-team on 2015-04-26

Launchpad automatic translations update.

985. By Launchpad Translations on behalf of phablet-team on 2015-04-27

Launchpad automatic translations update.

986. By Launchpad Translations on behalf of phablet-team on 2015-04-28

Launchpad automatic translations update.

987. By Launchpad Translations on behalf of phablet-team on 2015-04-29

Launchpad automatic translations update.

988. By Launchpad Translations on behalf of phablet-team on 2015-04-30

Launchpad automatic translations update.

989. By Alexandre Abreu on 2015-04-30

Add multi-window support for webapps Fixes: #1411722
Approved by: Olivier Tilloy

990. By CI Train Bot Account on 2015-04-30

Releasing 0.23+15.04.20150430.1-0ubuntu1

991. By CI Train Bot Account on 2015-05-05

Resync trunk.

992. By Launchpad Translations on behalf of phablet-team on 2015-05-06

Launchpad automatic translations update.

993. By Leo Arias on 2015-05-06

Fixed flake8 error. Fixes: #1444170
Approved by: Olivier Tilloy

994. By Olivier Tilloy on 2015-05-06

Run autopilot tests in a temporary profile directory, to avoid polluting the current user’s profile. Fixes: #1448838

995. By Arthur Mello on 2015-05-06

Change asset for the bottom edge hint.
Add text with open tabs count.
Approved by: Olivier Tilloy

996. By Olivier Tilloy on 2015-05-06

Save the session periodically to mitigate the situation where multiple new tabs had been created when the browser crashes. Fixes: #1449761

997. By Olivier Tilloy on 2015-05-06

Visual feedback for pressed state of chrome buttons and drawer menu entries. Fixes: #1448336

998. By Olivier Tilloy on 2015-05-06

Remove deprecated compatibility code.
Approved by: David Barth

999. By CI Train Bot Account on 2015-05-06

Releasing 0.23+15.04.20150506-0ubuntu1

1000. By CI Train Bot Account on 2015-05-11

Resync trunk.

1001. By Olivier Tilloy on 2015-05-11

Update translation template.

1002. By Launchpad Translations on behalf of phablet-team on 2015-05-12

Launchpad automatic translations update.

1003. By Riccardo Padovani on 2015-05-12

Add support for data: URIs in the address bar, and remove length limitation for TLDs. Fixes: #1377953, #1441281, #1450154
Approved by: Olivier Tilloy

1004. By Leo Arias on 2015-05-12

Fix the base class used when launching the app in autopilot tests.
Approved by: Olivier Tilloy, Christopher Lee

1005. By Olivier Tilloy on 2015-05-12

Also set XDG_CONFIG_HOME (needed for tests not to override user-defined settings).

1006. By Ugo Riboni on 2015-05-12

Add suggestions from search engines in the suggestions list. Fixes: #1351151
Approved by: Olivier Tilloy

1007. By Olivier Tilloy on 2015-05-12

Use the new Oxide APIs to better control visibility of the chrome.
This bumps the runtime dependency on liboxideqt-qmlplugin to 1.7. Fixes: #1441064, #1453908
Approved by: Alexandre Abreu

1008. By CI Train Bot Account on 2015-05-12

Releasing 0.23+15.04.20150512-0ubuntu1

1009. By CI Train Bot Account on 2015-05-13

Resync trunk.

1010. By Launchpad Translations on behalf of phablet-team on 2015-05-14

Launchpad automatic translations update.

1011. By Launchpad Translations on behalf of phablet-team on 2015-05-15

Launchpad automatic translations update.

1012. By Olivier Tilloy on 2015-05-15

Look for custom search engines description files in several locations.
This adds a build dependency on qml-module-qt-labs-folderlistmodel, to run unit tests at package construction time. Fixes: #1455207

1013. By Olivier Tilloy on 2015-05-15

Delay showing the fullscreen hint to prevent it from jumping up while the webview is being resized. Fixes: #1454097
Approved by: Ugo Riboni

1014. By Olivier Tilloy on 2015-05-15

Use checkboxes instead of switches for verb phrases, per design guidance. Fixes: #1442851
Approved by: Riccardo Padovani

1015. By Olivier Tilloy on 2015-05-15

Change the homepage in tests so that the domain name doesn’t contain a dot, to work around https://launchpad.net/bugs/1108742.

1016. By CI Train Bot Account on 2015-05-15

Releasing 0.23+15.04.20150515-0ubuntu1

1017. By CI Train Bot Account on 2015-05-19

Resync trunk.

1018. By Launchpad Translations on behalf of phablet-team on 2015-05-20

Launchpad automatic translations update.

1019. By Olivier Tilloy on 2015-05-22

Make use of the WebContext.maxCacheSizeHint property, introduced in Oxide 1.6.
This bumps the dependency of qtdeclarative5-ubuntu-web-plugin on liboxideqt-qmlplugin to 1.6. Fixes: #1277659
Approved by: Alexandre Abreu

1020. By Olivier Tilloy on 2015-05-22

Ensure the search engine delegates do not overlap with the settings header. Fixes: #1455399
Approved by: Riccardo Padovani

1021. By Olivier Tilloy on 2015-05-22

When opening a new blank tab, always clear the address bar. Fixes: #1456199
Approved by: Arthur Mello

1022. By Arthur Mello on 2015-05-22

Implement private browsing mode per design specification. Fixes: #1351179, #1457925, #1457958
Approved by: Olivier Tilloy

1023. By Olivier Tilloy on 2015-05-22

Add Qwant to the default list of search engines.

1024. By Olivier Tilloy on 2015-05-22

Add missing import statement. Fixes: #1457060
Approved by: Alexandre Abreu

1025. By Olivier Tilloy on 2015-05-22

Remove a number of useless calls to QTest::qWait() in unit tests, thus making them significantly faster to run.

1026. By Olivier Tilloy on 2015-05-22

Fix a flaky autopilot test.
On a mobile device with network access, the URL (http://en.wikipedia.org/wiki/Linux) might be rewritten to https://en.m.wikipedia.org/wiki/Linux, thus making the test racy depending on when the check on the webview’s URL is performed. Fixes: #1456885

1027. By Olivier Tilloy on 2015-05-22

Delay hiding the tab contents to give it an opportunity to grab an up-to-date capture.
Improve the tab switching animation to not flicker and jump around that much. Fixes: #1452998

1028. By CI Train Bot Account on 2015-05-22

Releasing 0.23+15.04.20150522.1-0ubuntu1

1029. By Olivier Tilloy on 2015-05-22

Update translation template.

1030. By Launchpad Translations on behalf of phablet-team on 2015-05-23

Launchpad automatic translations update.

1031. By Launchpad Translations on behalf of phablet-team on 2015-05-24

Launchpad automatic translations update.

1032. By Launchpad Translations on behalf of phablet-team on 2015-05-25

Launchpad automatic translations update.

1033. By Launchpad Translations on behalf of phablet-team on 2015-05-26

Launchpad automatic translations update.

1034. By Launchpad Translations on behalf of phablet-team on 2015-05-28

Launchpad automatic translations update.

1035. By Launchpad Translations on behalf of phablet-team on 2015-05-29

Launchpad automatic translations update.

1036. By Launchpad Translations on behalf of phablet-team on 2015-05-31

Launchpad automatic translations update.

1037. By Olivier Tilloy on 2015-06-02

Bump build dependency on liboxideqt-qmlplugin to 1.6 to fix unit tests.

1038. By Riccardo Padovani on 2015-06-02

New tab view refactoring. Fixes: #1351157, #1371248, #1389605, #1442190, #1444023
Approved by: Olivier Tilloy

1039. By Olivier Tilloy on 2015-06-02

Remove the upstreamcomponents folder, and use components from the UITK instead.
Add autopilot tests for the new tab view.
Approved by: Riccardo Padovani

1040. By Olivier Tilloy on 2015-06-02

Do not try to remove a file that doesn’t exist.

1041. By Olivier Tilloy on 2015-06-02

Updated icon. Fixes: #1457424

1042. By Olivier Tilloy on 2015-06-02

Pass plain strings to the worker script instead of RegExps. Fixes: #1445673
Approved by: Chris Coulson

1043. By Olivier Tilloy on 2015-06-02

Do not cache favicons on disk when browsing in private mode. Fixes: #1458963
Approved by: Arthur Mello

1044. By Olivier Tilloy on 2015-06-02

Actually clear the network cache by deleting the correct set of files in the correct directory. Fixes: #1459956

1045. By CI Train Bot Account on 2015-06-02

Releasing 0.23+15.10.20150602-0ubuntu1

1046. By Olivier Tilloy on 2015-06-02

Update translation template.

1047. By Launchpad Translations on behalf of phablet-team on 2015-06-03

Launchpad automatic translations update.

1048. By Launchpad Translations on behalf of phablet-team on 2015-06-04

Launchpad automatic translations update.

1049. By Olivier Tilloy on 2015-06-04

Updated bzr ignore rules.

1050. By Launchpad Translations on behalf of phablet-team on 2015-06-05

Launchpad automatic translations update.

1051. By Launchpad Translations on behalf of phablet-team on 2015-06-06

Launchpad automatic translations update.

1052. By Launchpad Translations on behalf of phablet-team on 2015-06-07

Launchpad automatic translations update.

1053. By Launchpad Translations on behalf of phablet-team on 2015-06-09

Launchpad automatic translations update.

1054. By Alexandre Abreu on 2015-06-10

Ensure SAML requests are followed even if the app is interrupted and restarted. Fixes: #1451432, #1452142

1055. By Alexandre Abreu on 2015-06-10

Handle desktop download by forwarding to the default browser Fixes: #1309657
Approved by: Olivier Tilloy

1056. By CI Train Bot Account on 2015-06-10

Releasing 0.23+15.10.20150610-0ubuntu1

1057. By CI Train Bot Account on 2015-06-11

Resync trunk.

1058. By Launchpad Translations on behalf of phablet-team on 2015-06-12

Launchpad automatic translations update.

1059. By Timo Jyrinki on 2015-06-15

No-change rebuild against Qt 5.4.2.

1060. By Launchpad Translations on behalf of phablet-team on 2015-06-16

Launchpad automatic translations update.

1061. By Launchpad Translations on behalf of phablet-team on 2015-06-17

Launchpad automatic translations update.

1062. By Launchpad Translations on behalf of phablet-team on 2015-06-18

Launchpad automatic translations update.

1063. By Ugo Riboni on 2015-06-18

Make the browser chrome usable on desktop by implementing common keyboard shortcuts and behaviors that users normally expect in such an app Fixes: #1287361
Approved by: Olivier Tilloy

1064. By Olivier Tilloy on 2015-06-18

Toggle application-level fullscreen when pressing F11. Fixes: #1464333

1065. By Michael Terry on 2015-06-18

Fix spelling of OK in private browsing dialog.
Approved by: Olivier Tilloy

1066. By Olivier Tilloy on 2015-06-18

Do not honour fullscreen requests silently at the Ubuntu WebView level.
Instead delegate that behaviour to the webview implementation used by the browser and the webapp container. Fixes: #1464249
Approved by: PS Jenkins bot, Alexandre Abreu

1067. By Olivier Tilloy on 2015-06-18

Actually push URLs to the clipboard.
For some reason setting the "text/url-list" mime type doesn’t seem to work (or other applications do not implement pasting this kind of data), but "text/plain" works well enough for this purpose. Fixes: #1463435
Approved by: PS Jenkins bot, Alexandre Abreu

1068. By CI Train Bot Account on 2015-06-18

Releasing 0.23+15.10.20150618-0ubuntu1

1069. By CI Train Bot Account on 2015-06-19

Resync trunk.

1070. By Launchpad Translations on behalf of phablet-team on 2015-06-20

Launchpad automatic translations update.

1071. By Olivier Tilloy on 2015-06-22

Update translation template.

1072. By Launchpad Translations on behalf of phablet-team on 2015-06-23

Launchpad automatic translations update.

1073. By Launchpad Translations on behalf of phablet-team on 2015-06-24

Launchpad automatic translations update.

1074. By Alberto Mardegan on 2015-06-24

Show an error screen if the trust session could not be opened. Fixes: #1441873
Approved by: PS Jenkins bot

1075. By CI Train Bot Account on 2015-06-24

Releasing 0.23+15.10.20150624-0ubuntu1

1076. By CI Train Bot Account on 2015-07-02

Resync trunk.

1077. By Arthur Mello on 2015-07-02

Implement bookmark folders Fixes: #1259247, #1351147
Approved by: PS Jenkins bot

1078. By CI Train Bot Account on 2015-07-02

Releasing 0.23+15.10.20150702.1-0ubuntu1

1079. By CI Train Bot Account on 2015-07-03

Resync trunk.

1080. By Olivier Tilloy on 2015-07-03

Update translation template.

1081. By Launchpad Translations on behalf of phablet-team on 2015-07-04

Launchpad automatic translations update.

1082. By Launchpad Translations on behalf of phablet-team on 2015-07-05

Launchpad automatic translations update.

1083. By Launchpad Translations on behalf of phablet-team on 2015-07-06

Launchpad automatic translations update.

1084. By Launchpad Translations on behalf of phablet-team on 2015-07-07

Launchpad automatic translations update.

1085. By Launchpad Translations on behalf of phablet-team on 2015-07-08

Launchpad automatic translations update.

1086. By Olivier Tilloy on 2015-07-08

Display the full URL when focusing the address bar. Fixes: #1472161

1087. By CI Train Bot Account on 2015-07-08

Releasing 0.23+15.10.20150708-0ubuntu1

1088. By Launchpad Translations on behalf of phablet-team on 2015-07-09

Launchpad automatic translations update.

1089. By Olivier Tilloy on 2015-07-09

Desktop tabs for convergence.

1090. By CI Train Bot Account on 2015-07-09

Releasing 0.23+15.10.20150709.3-0ubuntu1

1091. By Olivier Tilloy on 2015-07-09

Speed up a bunch of autopilot tests by not requiring to input and validate a URL in the address bar.

1092. By Olivier Tilloy on 2015-07-09

Prefer target_link_libraries(…) with Qt5:: prefixed modules over qt5_use_modules,
per documentation at http://doc.qt.io/qt-5/cmake-manual.html.
Approved by: PS Jenkins bot

1093. By Olivier Tilloy on 2015-07-09

Disable periodic session saving while incognito. The public session is unlikely to change significantly while browsing incognito.

Save the public session right away when going incognito.

1094. By CI Train Bot Account on 2015-07-09

Releasing 0.23+15.10.20150709.4-0ubuntu1

1095. By CI Train Bot Account on 2015-07-15

Resync trunk.

1096. By Launchpad Translations on behalf of phablet-team on 2015-07-16

Launchpad automatic translations update.

1097. By Launchpad Translations on behalf of phablet-team on 2015-07-17

Launchpad automatic translations update.

1098. By Launchpad Translations on behalf of phablet-team on 2015-07-21

Launchpad automatic translations update.

1099. By Launchpad Translations on behalf of phablet-team on 2015-07-22

Launchpad automatic translations update.

1100. By Launchpad Translations on behalf of phablet-team on 2015-07-23

Launchpad automatic translations update.

1101. By Launchpad Translations on behalf of phablet-team on 2015-07-24

Launchpad automatic translations update.

1102. By Launchpad Translations on behalf of phablet-team on 2015-07-26

Launchpad automatic translations update.

1103. By Launchpad Translations on behalf of phablet-team on 2015-07-28

Launchpad automatic translations update.

1104. By Olivier Tilloy on 2015-07-28

Fix narrowing conversion that makes the build fail with GCC 5. Fixes: #1475621
Approved by: Alexandre Abreu, PS Jenkins bot

1105. By CI Train Bot Account on 2015-07-28

Releasing 0.23+15.10.20150728-0ubuntu1

1106. By Launchpad Translations on behalf of phablet-team on 2015-07-29

Launchpad automatic translations update.

1107. By Olivier Tilloy on 2015-07-29

When clearing browsing data, confirm action with a dialog, to give the user a chance to cancel it. Fixes: #1471747
Approved by: PS Jenkins bot, Riccardo Padovani

1108. By Olivier Tilloy on 2015-07-29

Ensure a value is always returned by BookmarksModel::addFolder(…).
Approved by: PS Jenkins bot

1109. By Olivier Tilloy on 2015-07-29

Update icon, per UI specification. Fixes: #1412732
Approved by: PS Jenkins bot, Riccardo Padovani

1110. By CI Train Bot Account on 2015-07-29

Releasing 0.23+15.10.20150729-0ubuntu1

1111. By CI Train Bot Account on 2015-07-30

Resync trunk.

1112. By Launchpad Translations on behalf of phablet-team on 2015-07-31

Launchpad automatic translations update.

1113. By Olivier Tilloy on 2015-07-31

Update translation template.

1114. By Launchpad Translations on behalf of phablet-team on 2015-08-01

Launchpad automatic translations update.

1115. By Launchpad Translations on behalf of phablet-team on 2015-08-02

Launchpad automatic translations update.

1116. By Launchpad Translations on behalf of phablet-team on 2015-08-05

Launchpad automatic translations update.

1117. By Launchpad Translations on behalf of phablet-team on 2015-08-06

Launchpad automatic translations update.

1118. By Steve Langasek on 2015-08-07

Add missing changelog entry due to direct upload.

1119. By Launchpad Translations on behalf of phablet-team on 2015-08-09

Launchpad automatic translations update.

1120. By Olivier Tilloy on 2015-08-10

Update all imports of:
 - Ubuntu.Components to 1.3
 - QtQuick to 2.4
 - QtQuick.Window to 2.2

This bumps the required versions of qtdeclarative5-ubuntu-ui-toolkit-plugin, qml-module-qtquick2 and qml-module-qtquick-window2 in debian/control. Fixes: #1483279

1121. By CI Train Bot Account on 2015-08-10

Releasing 0.23+15.10.20150810-0ubuntu1

1122. By Olivier Tilloy on 2015-08-11

Implement the "Find in Page" feature.
This bumps the runtime dependency on liboxideqt-qmlplugin to 1.8. Fixes: #1312260
Approved by: Riccardo Padovani

1123. By Olivier Tilloy on 2015-08-11

Drop old names for QML dependencies.
Original patch by Robert Ancell.

1124. By Olivier Tilloy on 2015-08-11

Highlight matching terms in one pass. Fixes: #1481206
Approved by: PS Jenkins bot, Ugo Riboni

1125. By CI Train Bot Account on 2015-08-11

Releasing 0.23+15.10.20150811-0ubuntu1

1126. By Olivier Tilloy on 2015-08-11

Update translation template.

1127. By Launchpad Translations on behalf of phablet-team on 2015-08-12

Launchpad automatic translations update.

1128. By Arthur Mello on 2015-08-12

Wide screen versions of the history view and new tab view, per design specification.
This adds a build dependency on qml-module-qt-labs-settings (for unit tests). Fixes: #1351157, #1481647

1129. By CI Train Bot Account on 2015-08-12

Releasing 0.23+15.10.20150812.1-0ubuntu1

1130. By Olivier Tilloy on 2015-08-13

Update translation template.

1131. By Launchpad Translations on behalf of phablet-team on 2015-08-13

Launchpad automatic translations update.

1132. By Olivier Tilloy on 2015-08-13

Remove strong typing of the contextualActions and selectionActions properties.
This would cause issues if an app imported Ubuntu.Web along with Ubuntu.Components < 1.3 and overrode one of these properties, because the webview expected an ActionList 1.3, and would get an earlier version. Fixes: #1484437

1133. By CI Train Bot Account on 2015-08-13

Releasing 0.23+15.10.20150813.1-0ubuntu1

1134. By CI Train Bot Account on 2015-08-14

Resync trunk.

1135. By Ugo Riboni on 2015-08-14

Delay the exit from fullscreen mode until focus remains lost for a certain amount of time. Fixes: #1477308
Approved by: Olivier Tilloy

1136. By Ugo Riboni on 2015-08-14

Disable find in page when the new tab view is active. Fixes: #1483847
Approved by: Olivier Tilloy

1137. By CI Train Bot Account on 2015-08-14

Releasing 0.23+15.10.20150814-0ubuntu1

1138. By Launchpad Translations on behalf of phablet-team on 2015-08-15

Launchpad automatic translations update.

1139. By Launchpad Translations on behalf of phablet-team on 2015-08-16

Launchpad automatic translations update.

1140. By Launchpad Translations on behalf of phablet-team on 2015-08-17

Launchpad automatic translations update.

1141. By Colin Watson on 2015-08-17

Fix versioned dependencies on qtdeclarative5-ubuntu-ui-toolkit-plugin to allow qtdeclarative5-ubuntu-ui-toolkit-plugin-gles.
Approved by: Olivier Tilloy

1142. By Arthur Mello on 2015-08-17

Wait for OptionSelector's collapsing transition to finish Fixes: #1484175
Approved by: Olivier Tilloy

1143. By Arthur Mello on 2015-08-17

Make sure to set the historyModel to the HistoryView component when browser wide property changes Fixes: #1484555
Approved by: Olivier Tilloy

1144. By CI Train Bot Account on 2015-08-17

Releasing 0.23+15.10.20150817-0ubuntu1

1145. By Launchpad Translations on behalf of phablet-team on 2015-08-20

Launchpad automatic translations update.

1146. By Ugo Riboni on 2015-08-20

Merge two url utility files into one, since they had no reason for being separate. Add unit tests for some of the functions that had none.
Approved by: Olivier Tilloy

1147. By Alexandre Abreu on 2015-08-20

Fix webapp name logic Fixes: #1473472
Approved by: Olivier Tilloy

1148. By Arthur Mello on 2015-08-20

Add support for removing history entries with delete key in HistoryViewWide Fixes: #1484562
Approved by: Olivier Tilloy

1149. By Olivier Tilloy on 2015-08-20

Remove an old workaround for an issue that was fixed since then in the content hub and that caused the file picker to accept the selected file twice.
Approved by: Michael Sheldon, Alexandre Abreu

1150. By CI Train Bot Account on 2015-08-20

Releasing 0.23+15.10.20150820-0ubuntu1

1151. By CI Train Bot Account on 2015-08-27

Resync trunk.

1152. By Olivier Tilloy on 2015-08-27

Use the contextMenu API new in oxide 1.8.
Update the visuals for the context menu in narrow and wide form factors.
Add text editing commands to the context menu.
Add unit and autopilot tests for the context menu features.
This bumps the runtime dependency of webapp-container and qtdeclarative5-ubuntu-web-plugin on liboxideqt-qmlplugin to 1.8.
This also removes the qtdeclarative5-ubuntu-web-plugin-assets binary package, which contained only one PNG asset which is not used anywhere any longer. Fixes: #1264493, #1326070, #1438046, #1450430, #1471181, #1477309, #1477310, #1477315, #1487090
Approved by: PS Jenkins bot, Ugo Riboni, Ken VanDine

1153. By CI Train Bot Account on 2015-08-27

Releasing 0.23+15.10.20150827.3-0ubuntu1

1154. By CI Train Bot Account on 2015-08-31

Resync trunk.

1155. By Olivier Tilloy on 2015-09-01

Update translation template.

1156. By Launchpad Translations on behalf of phablet-team on 2015-09-01

Launchpad automatic translations update.

1157. By Alexandre Abreu on 2015-09-01

update to trunk

1158. By Alexandre Abreu on 2016-06-15

merge trunk

Unmerged revisions

1158. By Alexandre Abreu on 2016-06-15

merge trunk

1157. By Alexandre Abreu on 2015-09-01

update to trunk

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-01 09:44:20 +0000
+++ CMakeLists.txt	2016-06-16 15:34:13 +0000
@@ -77,3 +77,4 @@
         DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app)
 
 add_subdirectory(click-hooks)
+add_subdirectory(helper)

=== added directory 'helper'
=== added file 'helper/CMakeLists.txt'
--- helper/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ helper/CMakeLists.txt	2016-06-16 15:34:13 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(homescreen-webapp-installer)

=== added directory 'helper/homescreen-webapp-installer'
=== added file 'helper/homescreen-webapp-installer/CMakeLists.txt'
--- helper/homescreen-webapp-installer/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ helper/homescreen-webapp-installer/CMakeLists.txt	2016-06-16 15:34:13 +0000
@@ -0,0 +1,3 @@
+project(webapp-install-helper)
+
+install(FILES homescreen-webapp-installer.py DESTINATION ${CMAKE_INSTALL_BINDIR})

=== added file 'helper/homescreen-webapp-installer/homescreen-webapp-installer.py'
--- helper/homescreen-webapp-installer/homescreen-webapp-installer.py	1970-01-01 00:00:00 +0000
+++ helper/homescreen-webapp-installer/homescreen-webapp-installer.py	2016-06-16 15:34:13 +0000
@@ -0,0 +1,266 @@
+#!/usr/bin/env python
+
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2015 Canonical
+#
+# 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 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/>.
+
+""" Webapp click package installation """
+
+import optparse
+import os
+import sys
+import subprocess
+import tempfile
+import urllib2
+import urlparse
+
+
+name = ''
+domain = ''
+homepage = ''
+icons = ''
+
+parser = optparse.OptionParser()
+
+parser.add_option(
+    "-d",
+    "--domain",
+    type="string",
+    help="Domain name for that ",
+    dest="domain",
+    default="")
+parser.add_option(
+    "-n",
+    "--name",
+    type="string",
+    help="Webapp name",
+    dest="name",
+    default="")
+parser.add_option(
+    "-p",
+    "--homepage",
+    type="string",
+    help="Webapp startup homepage",
+    dest="homepage",
+    default="")
+parser.add_option(
+    "-i",
+    "--icons",
+    type="string",
+    help="Icon urls for this webapp",
+    dest="icons",
+    default="")
+
+options, arguments = parser.parse_args()
+
+
+
+class Icons(object):
+    def __init__(self, icon_uris):
+        self.icon_uris = [
+            icon_uri for icon_uri in icon_uris
+            if urlparse.urlparse(icon_uri).netloc != ""
+        ]
+
+    def get(self):
+        if len(self.icon_uris) == 0:
+            return False
+        for icon_uri in self.icon_uris:
+            try:
+                # TODO: cookies & UA
+                content = urllib2.urlopen(icon_uri).read()
+                if content:
+                    return content
+            except Exception, e:
+                print "Exception while retrieving icon resource", \
+                    icon_uri, \
+                    ":", \
+                    str(e)
+        return None
+
+
+class Click(object):
+    def __init__(self, name, domain, homepage, icon_uris):
+        self.name = name
+        self.package_name = self._get_package_name(name)
+        self.domain = domain
+        self.homepage = homepage
+        # TODO handle sizes
+        self.icon_content = Icons(icon_uris).get()
+
+    def _generate_valid_filename(self):
+        filename = self.domain.lower().replace('.', '')
+        return filename
+
+    def generate(self):
+        temp_folder = tempfile.gettempdir()
+        temp_click_folder = tempfile.mkdtemp(dir=temp_folder)
+
+        filename = self._generate_valid_filename()
+
+        desktop_filename = "{}.desktop".format(filename)
+        apparmor_filename = "{}.appamor".format(filename)
+        manifest_filename = "manifest.json"
+        icon_filename = "{}.png".format(filename)
+
+        package_name = self._get_package_name(filename)
+        version = "1.0"
+
+        f = open(os.path.join(temp_click_folder, desktop_filename), "w+")
+        f.write(self._generate_desktop(icon_filename))
+        f.close()
+
+        f = open(os.path.join(temp_click_folder, apparmor_filename), "w+")
+        f.write(self._generate_apparmor())
+        f.close()
+
+        f = open(os.path.join(temp_click_folder, manifest_filename), "w+")
+        f.write(
+            self._generate_manifest(
+                filename,
+                package_name,
+                apparmor_filename,
+                desktop_filename,
+                version
+            )
+        )
+        f.close()
+
+        if self.icon_content:
+            f = open(
+                os.path.join(
+                    temp_click_folder,
+                    icon_filename
+                ),
+                "wb+"
+            )
+            f.write(self.icon_content)
+            f.close()
+
+        cwd = os.getcwd()
+        os.chdir(temp_click_folder)
+        output = subprocess.check_output(
+            ['click',
+             'build',
+             temp_click_folder]
+        )
+        os.chdir(cwd)
+
+        return os.path.join(
+            temp_click_folder,
+            "{}_{}_all.click".format(
+                package_name,
+                version
+            )
+        )
+
+    def _get_package_name(self, valid_app_name):
+        return "{}.user-webapps-installer".format(valid_app_name)
+
+    def _generate_apparmor(self):
+        return """
+{
+  "template": "ubuntu-webapp",
+  "policy_groups": [
+    "networking",
+    "audio",
+    "video",
+    "webview"
+  ],
+  "policy_version": 1.2
+}
+"""
+
+    def _generate_manifest(
+            self,
+            base_name,
+            package_name,
+            apparmor_filename,
+            desktop_filename,
+            version):
+        return """
+{{
+    "description": "{}",
+    "framework": "ubuntu-sdk-14.10",
+    "architecture": "all",
+    "hooks": {{
+        "{}": {{
+            "apparmor": "{}",
+            "desktop": "{}"
+        }}
+    }},
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "{}",
+    "title": "{}",
+    "version": "1.0"
+}}
+""".format(self.name,
+           base_name,
+           apparmor_filename,
+           desktop_filename,
+           package_name,
+           self.name,
+           version)
+
+    def _generate_desktop(self, icon_filename):
+        return """
+[Desktop Entry]
+Type=Application
+Terminal=false
+Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?://{}/* {} %u
+Name={}
+Icon=./{}
+X-Ubuntu-Touch=true
+X-Ubuntu-Single-Instance=true
+X-Ubuntu-Default-Department-ID=internet
+""".format(self.domain,
+           self.homepage,
+           self.name,
+           icon_filename)
+
+def install_webapp(
+        name,
+        domain,
+        homepage,
+        icon_uris):
+    click = Click(name, domain, homepage, icon_uris)
+    click_package_filename = click.generate()
+
+    subprocess.check_output(
+        ['pkcon',
+         'install-local',
+         '--allow-untrusted',
+         click_package_filename]
+    )
+
+    os.remove(click_package_filename)
+
+
+if options.homepage == "" or \
+   options.name == "" or \
+   options.domain == "":
+    print "Invalid options", homepage, name, domain
+    sys.exit(1)
+
+
+try:
+    install_webapp(
+        options.name,
+        options.domain,
+        options.homepage,
+        options.icons
+    )
+except Exception, e:
+    print 'Error:', str(e)
+    sys.exit(1)

=== modified file 'po/webbrowser-app.pot'
--- po/webbrowser-app.pot	2016-06-02 17:30:05 +0000
+++ po/webbrowser-app.pot	2016-06-16 15:34:13 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the webbrowser-app package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: webbrowser-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-02 19:24+0200\n"
+"POT-Creation-Date: 2015-09-01 15:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -23,13 +23,13 @@
 msgstr ""
 
 #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47
-#: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59
-#: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101
+#: src/app/ConfirmDialog.qml:26 src/app/PromptDialog.qml:32
+#: src/app/webbrowser/BookmarkOptions.qml:101
 #: src/app/webbrowser/LeavePrivateModeDialog.qml:39
 msgid "OK"
 msgstr ""
 
-#: src/app/AuthenticationDialog.qml:24 src/app/HttpAuthenticationDialog.qml:25
+#: src/app/AuthenticationDialog.qml:24
 msgid "Authentication required."
 msgstr ""
 
@@ -39,25 +39,23 @@
 msgid "The website %1 requires authentication."
 msgstr ""
 
-#: src/app/AuthenticationDialog.qml:34 src/app/HttpAuthenticationDialog.qml:39
+#: src/app/AuthenticationDialog.qml:34
 msgid "Username"
 msgstr ""
 
-#: src/app/AuthenticationDialog.qml:41 src/app/HttpAuthenticationDialog.qml:49
+#: src/app/AuthenticationDialog.qml:41
 msgid "Password"
 msgstr ""
 
 #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31
-#: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38
-#: src/app/webbrowser/BookmarkOptions.qml:143
-#: src/app/webbrowser/ContentDownloadDialog.qml:114
-#: src/app/webbrowser/ContextMenuMobile.qml:139
-#: src/app/webbrowser/DownloadDelegate.qml:187
+#: src/app/PromptDialog.qml:38 src/app/webbrowser/BookmarkOptions.qml:143
+#: src/app/webbrowser/ContextMenuMobile.qml:142
+#: src/app/webbrowser/HistoryView.qml:165
+#: src/app/webbrowser/HistoryViewWide.qml:307
 #: src/app/webbrowser/LeavePrivateModeDialog.qml:32
-#: src/app/webbrowser/SettingsPage.qml:258
-#: src/app/webbrowser/SettingsPage.qml:312
+#: src/app/webbrowser/SettingsPage.qml:289
+#: src/app/webbrowser/SettingsPage.qml:343
 #: src/app/webcontainer/AccountChooserDialog.qml:96
-#: src/app/webcontainer/ContextMenuMobile.qml:141
 msgid "Cancel"
 msgstr ""
 
@@ -110,13 +108,18 @@
 msgstr ""
 
 #: src/app/ErrorSheet.qml:48
-msgid "Please check your network settings and try refreshing the page."
+msgid ""
+"Ubuntu suggests you check your network settings and try refreshing the page."
 msgstr ""
 
 #: src/app/ErrorSheet.qml:53
 msgid "Refresh page"
 msgstr ""
 
+#: src/app/FilePickerDialog.qml:28
+msgid "Please choose a file"
+msgstr ""
+
 #: src/app/GeolocationPermissionRequest.qml:28
 msgid "Permission Request"
 msgstr ""
@@ -276,36 +279,6 @@
 "which failed our security checks for an unknown reason."
 msgstr ""
 
-#: src/app/MediaAccessDialog.qml:31
-msgid "Permission"
-msgstr ""
-
-#: src/app/MediaAccessDialog.qml:38
-msgid "Allow this domain to access your camera and microphone?"
-msgstr ""
-
-#: src/app/MediaAccessDialog.qml:39
-msgid "Allow this domain to access your camera?"
-msgstr ""
-
-#: src/app/MediaAccessDialog.qml:40
-msgid "Allow this domain to access your microphone?"
-msgstr ""
-
-#. TRANSLATORS: %1 is the URL of the site requesting access to camera and/or microphone and %2 is the URL of the site that embeds it
-#: src/app/MediaAccessDialog.qml:48
-#, qt-format
-msgid "%1 (embedded in %2)"
-msgstr ""
-
-#: src/app/MediaAccessDialog.qml:72
-msgid "Yes"
-msgstr ""
-
-#: src/app/MediaAccessDialog.qml:83
-msgid "No"
-msgstr ""
-
 #: src/app/PromptDialog.qml:23
 msgid "JavaScript Prompt"
 msgstr ""
@@ -374,7 +347,7 @@
 msgid "Erase"
 msgstr ""
 
-#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:568
+#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:402
 msgid "Find in page"
 msgstr ""
 
@@ -404,8 +377,7 @@
 msgid "Address;URL;www"
 msgstr ""
 
-#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:451
-#: src/app/webbrowser/TabsBar.qml:91
+#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:687
 msgid "New Tab"
 msgstr ""
 
@@ -419,10 +391,6 @@
 msgid "Open image in new tab"
 msgstr ""
 
-#: src/app/actions/OpenLinkInBrowser.qml:22
-msgid "Open link in default browser"
-msgstr ""
-
 #: src/app/actions/OpenLinkInNewBackgroundTab.qml:22
 msgid "Open link in new background tab"
 msgstr ""
@@ -431,10 +399,6 @@
 msgid "Open link in new tab"
 msgstr ""
 
-#: src/app/actions/OpenVideoInNewTab.qml:22
-msgid "Open video in new tab"
-msgstr ""
-
 #: src/app/actions/Paste.qml:22
 msgid "Paste"
 msgstr ""
@@ -443,8 +407,7 @@
 msgid "Redo"
 msgstr ""
 
-#: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86
-#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51
+#: src/app/actions/Reload.qml:23
 msgid "Reload"
 msgstr ""
 
@@ -462,16 +425,13 @@
 msgid "Save link"
 msgstr ""
 
-#: src/app/actions/SaveVideo.qml:22
-msgid "Save video"
-msgstr ""
-
-#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:83
+#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/HistoryView.qml:180
+#: src/app/webbrowser/HistoryViewWide.qml:328
 msgid "Select all"
 msgstr ""
 
-#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:548
-msgid "Share"
+#: src/app/actions/ShareLink.qml:22
+msgid "Share…"
 msgstr ""
 
 #: src/app/actions/Undo.qml:22
@@ -479,16 +439,16 @@
 msgstr ""
 
 #. TRANSLATORS: %2 refers to the total number of find in page results and %1 to the highlighted result
-#: src/app/webbrowser/AddressBar.qml:208
+#: src/app/webbrowser/AddressBar.qml:221
 #, qt-format
 msgid "%1/%2"
 msgstr ""
 
-#: src/app/webbrowser/AddressBar.qml:244
+#: src/app/webbrowser/AddressBar.qml:259
 msgid "find in page"
 msgstr ""
 
-#: src/app/webbrowser/AddressBar.qml:245
+#: src/app/webbrowser/AddressBar.qml:260
 msgid "search or enter an address"
 msgstr ""
 
@@ -507,8 +467,9 @@
 msgstr ""
 
 #: src/app/webbrowser/BookmarkOptions.qml:78
-#: src/app/webbrowser/BookmarksFoldersView.qml:133
-#: src/app/webbrowser/BookmarksFoldersViewWide.qml:105
+#: src/app/webbrowser/BookmarksFolderListView.qml:115
+#: src/app/webbrowser/FavoriteOptionTabs.qml:211
+#: src/app/webbrowser/NewTabViewWide.qml:122
 msgid "All Bookmarks"
 msgstr ""
 
@@ -522,141 +483,119 @@
 msgstr ""
 
 #: src/app/webbrowser/BookmarkOptions.qml:153
-#: src/app/webbrowser/SettingsPage.qml:322
+#: src/app/webbrowser/SettingsPage.qml:353
 msgid "Save"
 msgstr ""
 
-#: src/app/webbrowser/BookmarksFoldersView.qml:191
-#: src/app/webbrowser/BookmarksFoldersViewWide.qml:148
-#: src/app/webbrowser/NewTabView.qml:253 src/app/webbrowser/SettingsPage.qml:85
-#: src/app/webbrowser/SettingsPage.qml:286
-msgid "Homepage"
-msgstr ""
-
-#: src/app/webbrowser/BookmarksView.qml:32
-#: src/app/webbrowser/BookmarksViewWide.qml:32
-#: src/app/webbrowser/Browser.qml:556 src/app/webbrowser/NewTabView.qml:130
-#: src/app/webbrowser/NewTabViewWide.qml:139
-msgid "Bookmarks"
-msgstr ""
-
-#: src/app/webbrowser/BookmarksView.qml:70
-#: src/app/webbrowser/BookmarksViewWide.qml:69
-#: src/app/webbrowser/Browser.qml:437 src/app/webbrowser/HistoryView.qml:128
-#: src/app/webbrowser/HistoryViewWide.qml:418
-msgid "Done"
-msgstr ""
-
-#: src/app/webbrowser/BookmarksView.qml:84
-#: src/app/webbrowser/BookmarksViewWide.qml:83
-#: src/app/webbrowser/HistoryView.qml:142
-#: src/app/webbrowser/HistoryViewWide.qml:432
-#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99
+#: src/app/webbrowser/Browser.qml:371
+msgid "Share"
+msgstr ""
+
+#: src/app/webbrowser/Browser.qml:378
+#: src/app/webbrowser/HistoryViewWide.qml:291
+msgid "History"
+msgstr ""
+
+#: src/app/webbrowser/Browser.qml:385
+msgid "Open tabs"
+msgstr ""
+
+#: src/app/webbrowser/Browser.qml:395 src/app/webbrowser/HistoryView.qml:121
+#: src/app/webbrowser/HistoryViewWide.qml:396
+#: src/app/webbrowser/TabsBar.qml:187 src/app/webbrowser/TabsList.qml:82
 msgid "New tab"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:562 src/app/webbrowser/HistoryView.qml:30
-#: src/app/webbrowser/HistoryViewWide.qml:35
-msgid "History"
-msgstr ""
-
-#: src/app/webbrowser/Browser.qml:575 src/app/webbrowser/DownloadsPage.qml:45
-msgid "Downloads"
-msgstr ""
-
-#: src/app/webbrowser/Browser.qml:582
+#: src/app/webbrowser/Browser.qml:412
 msgid "Leave Private Mode"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:582
+#: src/app/webbrowser/Browser.qml:412
 msgid "Private Mode"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:600 src/app/webbrowser/SettingsPage.qml:41
+#: src/app/webbrowser/Browser.qml:430 src/app/webbrowser/SettingsPage.qml:51
 msgid "Settings"
 msgstr ""
 
+#: src/app/webbrowser/Browser.qml:673 src/app/webbrowser/HistoryView.qml:108
+#: src/app/webbrowser/HistoryViewWide.qml:382
+msgid "Done"
+msgstr ""
+
 #. TRANSLATORS: %1 refers to the current number of tabs opened
-#: src/app/webbrowser/Browser.qml:772 src/app/webbrowser/Browser.qml:810
+#: src/app/webbrowser/Browser.qml:780
 #, qt-format
 msgid "(%1)"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:1366
+#: src/app/webbrowser/Browser.qml:1221
 msgid "Swipe Up To Exit Full Screen"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:1367
+#: src/app/webbrowser/Browser.qml:1222
 msgid "Press ESC To Exit Full Screen"
 msgstr ""
 
-#: src/app/webbrowser/ContentDownloadDialog.qml:83
-msgid ""
-"Choose an application to open this file or add it to the downloads folder."
-msgstr ""
-
-#: src/app/webbrowser/ContentDownloadDialog.qml:89
-msgid "Choose an application"
-msgstr ""
-
-#: src/app/webbrowser/ContentDownloadDialog.qml:102
-msgid "Download"
-msgstr ""
-
-#: src/app/webbrowser/DownloadDelegate.qml:159
-msgid "Download failed"
-msgstr ""
-
-#: src/app/webbrowser/DownloadDelegate.qml:208
-msgid "Resume"
-msgstr ""
-
-#: src/app/webbrowser/DownloadsPage.qml:59
-msgid "Confirm selection"
-msgstr ""
-
-#: src/app/webbrowser/DownloadsPage.qml:99
-msgid "Delete"
-msgstr ""
-
-#: src/app/webbrowser/DownloadsPage.qml:259
-msgid "No downloads available"
-msgstr ""
-
-#: src/app/webbrowser/ExpandedHistoryView.qml:119
+#: src/app/webbrowser/ExpandedHistoryView.qml:103
 #, qt-format
 msgid "%1 page"
 msgid_plural "%1 pages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/app/webbrowser/ExpandedHistoryView.qml:134
-#: src/app/webbrowser/NewTabView.qml:143
+#: src/app/webbrowser/ExpandedHistoryView.qml:118
+#: src/app/webbrowser/NewTabView.qml:123
 msgid "Less"
 msgstr ""
 
+#: src/app/webbrowser/FavoriteOptionTabs.qml:115
+msgid "Install App"
+msgstr ""
+
+#: src/app/webbrowser/FavoriteOptionTabs.qml:148
+msgid "Add bookmark"
+msgstr ""
+
+#: src/app/webbrowser/FavoriteOptionTabs.qml:187
+msgid "bookmark name"
+msgstr ""
+
+#: src/app/webbrowser/FavoriteOptionTabs.qml:198
+msgid "save in"
+msgstr ""
+
+#: src/app/webbrowser/FavoriteOptionTabs.qml:360
+msgid "Install"
+msgstr ""
+
 #: src/app/webbrowser/HistorySectionDelegate.qml:26
 msgid "Last Visited"
 msgstr ""
 
 #: src/app/webbrowser/HistorySectionDelegate.qml:48
-#: src/app/webbrowser/HistoryViewWide.qml:251
+#: src/app/webbrowser/HistoryViewWide.qml:149
 msgid "Yesterday"
 msgstr ""
 
-#: src/app/webbrowser/HistoryViewWide.qml:160
-msgid "search history"
+#: src/app/webbrowser/HistoryView.qml:210
+#: src/app/webbrowser/HistoryViewWide.qml:347
+msgid "Delete"
 msgstr ""
 
-#: src/app/webbrowser/HistoryViewWide.qml:235
+#: src/app/webbrowser/HistoryViewWide.qml:133
 msgid "All History"
 msgstr ""
 
-#: src/app/webbrowser/HistoryViewWide.qml:249
-#: src/app/webbrowser/HistoryViewWide.qml:347
+#: src/app/webbrowser/HistoryViewWide.qml:147
+#: src/app/webbrowser/HistoryViewWide.qml:212
 msgid "Today"
 msgstr ""
 
+#: src/app/webbrowser/HomescreenWebappInstaller.qml:141
+msgid "Invalid webapp meta information"
+msgstr ""
+
 #: src/app/webbrowser/LeavePrivateModeDialog.qml:24
 msgid "Going to public mode will close all private tabs"
 msgstr ""
@@ -671,37 +610,28 @@
 "Bookmarks you create will be preserved, however."
 msgstr ""
 
-#: src/app/webbrowser/NewTabView.qml:143
+#: src/app/webbrowser/NewTabView.qml:108
+#: src/app/webbrowser/NewTabViewWide.qml:313
+msgid "Bookmarks"
+msgstr ""
+
+#: src/app/webbrowser/NewTabView.qml:123
 msgid "More"
 msgstr ""
 
-#: src/app/webbrowser/NewTabView.qml:328
-#: src/app/webbrowser/NewTabViewWide.qml:138
+#: src/app/webbrowser/NewTabView.qml:226
+#: src/app/webbrowser/NewTabViewWide.qml:312
 msgid "Top sites"
 msgstr ""
 
-#: src/app/webbrowser/NewTabView.qml:359
+#: src/app/webbrowser/NewTabView.qml:257
 msgid "You haven't visited any site yet"
 msgstr ""
 
-#: src/app/webbrowser/SadTab.qml:48
-msgid "The rendering process has been closed for this tab."
-msgstr ""
-
-#. TRANSLATORS: %1 is the URL of the page that crashed the renderer process
-#: src/app/webbrowser/SadTab.qml:65
-#, qt-format
-msgid "Something went wrong while displaying %1."
-msgstr ""
-
-#: src/app/webbrowser/SadTab.qml:67
-msgid ""
-"The system is low on memory and can't display this webpage. Try closing "
-"unneeded tabs and reloading."
-msgstr ""
-
-#: src/app/webbrowser/SadTab.qml:80
-msgid "Close tab"
+#: src/app/webbrowser/NewTabViewWide.qml:160
+#: src/app/webbrowser/SettingsPage.qml:92
+#: src/app/webbrowser/SettingsPage.qml:317
+msgid "Homepage"
 msgstr ""
 
 #: src/app/webbrowser/SecurityCertificatePopover.qml:69
@@ -756,82 +686,61 @@
 msgid "Which is run by"
 msgstr ""
 
-#: src/app/webbrowser/SettingsDeviceSelector.qml:43
-msgid "Default"
-msgstr ""
-
-#: src/app/webbrowser/SettingsPage.qml:70
-#: src/app/webbrowser/SettingsPage.qml:150
+#: src/app/webbrowser/SettingsPage.qml:81
+#: src/app/webbrowser/SettingsPage.qml:176
 msgid "Search engine"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:96
+#: src/app/webbrowser/SettingsPage.qml:101
 msgid "Restore previous session at startup"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:115
-#: src/app/webbrowser/SettingsPage.qml:193
-msgid "Privacy & permissions"
-msgstr ""
-
-#: src/app/webbrowser/SettingsPage.qml:126
+#: src/app/webbrowser/SettingsPage.qml:119
+msgid "Allow opening new tabs in background"
+msgstr ""
+
+#: src/app/webbrowser/SettingsPage.qml:138
+#: src/app/webbrowser/SettingsPage.qml:228
+msgid "Privacy"
+msgstr ""
+
+#: src/app/webbrowser/SettingsPage.qml:146
 msgid "Reset browser settings"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:206
-#: src/app/webbrowser/SettingsPage.qml:342
-msgid "Camera & microphone"
-msgstr ""
-
-#: src/app/webbrowser/SettingsPage.qml:215
+#: src/app/webbrowser/SettingsPage.qml:249
 msgid "Clear Browsing History"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:219
+#: src/app/webbrowser/SettingsPage.qml:252
 msgid "Clear Browsing History?"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:227
+#: src/app/webbrowser/SettingsPage.qml:259
 msgid "Clear Cache"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:230
+#: src/app/webbrowser/SettingsPage.qml:261
 msgid "Clear Cache?"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:265
+#: src/app/webbrowser/SettingsPage.qml:296
 msgid "Clear"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:354
-msgid "Microphone"
-msgstr ""
-
-#: src/app/webbrowser/SettingsPage.qml:375
-msgid "Camera"
-msgstr ""
-
-#: src/app/webbrowser/TabPreview.qml:86
+#: src/app/webbrowser/TabPreview.qml:99
 msgid "Tap to view"
 msgstr ""
 
-#: src/app/webbrowser/TabsBar.qml:102
-msgid "Close Tab"
-msgstr ""
-
-#: src/app/webbrowser/UrlPreviewDelegate.qml:135
-msgid "Remove"
-msgstr ""
-
 #. TRANSLATORS: %1 refers to the current page’s title
 #: src/app/webbrowser/webbrowser-app.qml:35
-#: src/app/webcontainer/webapp-container.qml:69
+#: src/app/webcontainer/webapp-container.qml:68
 #, qt-format
 msgid "%1 - Ubuntu Web Browser"
 msgstr ""
 
 #: src/app/webbrowser/webbrowser-app.qml:37
-#: src/app/webcontainer/webapp-container.qml:71
+#: src/app/webcontainer/webapp-container.qml:70
 msgid "Ubuntu Web Browser"
 msgstr ""
 
@@ -863,10 +772,6 @@
 "time; please try again after closing all other account windows."
 msgstr ""
 
-#: src/app/webcontainer/AccountsLogic.qml:214
-msgid "Authentication failed"
-msgstr ""
-
 #. TRANSLATORS: %1 refers to the application name, %2 refers to the account provider
 #: src/app/webcontainer/AccountsSplashScreen.qml:45
 #, qt-format
@@ -896,10 +801,6 @@
 msgid "Choose account"
 msgstr ""
 
-#: src/app/webcontainer/SadPage.qml:45
-msgid "Oops, something went wrong."
-msgstr ""
-
 #: po/src/app/webbrowser/webbrowser-app.desktop.in.in.h:1
 msgid "Browser"
 msgstr ""

=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml	2016-02-12 10:12:30 +0000
+++ src/app/webbrowser/AddressBar.qml	2016-06-16 15:34:13 +0000
@@ -45,10 +45,14 @@
     property var findController: null
     property color fgColor: Theme.palette.normal.baseText
 
+    property bool webappCapableWebsite: false
+
     property var securityStatus: null
 
     readonly property Item bookmarkTogglePlaceHolder: bookmarkTogglePlaceHolderItem
 
+    onWebappCapableWebsiteChanged: handleWebappCapableUpdate(webappCapableWebsite)
+
     // XXX: for testing purposes only, do not use to modify the
     // contents/behaviour of the internals of the component.
     readonly property Item __textField: textField
@@ -59,6 +63,20 @@
         textField.selectAll()
     }
 
+    function handleWebappCapableUpdate(webappCapable) {
+        bookmarkToggleIcon.color = getBookmarkToggleColor(webappCapable)
+    }
+
+    function getBookmarkToggleColor(webappCapable) {
+        console.log(addressbar.bookmarked)
+        if (webappCapable) {
+            return UbuntuColors.lightAubergine
+        }
+
+        return addressbar.bookmarked ?
+                    UbuntuColors.orange : addressbar.fgColor
+    }
+
     Binding {
         target: findController
         property: "text"
@@ -220,12 +238,14 @@
                 visible: !findInPageMode && internal.idle && addressbar.actualUrl.toString()
 
                 Icon {
+                    id: bookmarkToggleIcon
+
                     height: parent.height - units.gu(2)
                     width: height
                     anchors.centerIn: parent
 
-                    name: addressbar.bookmarked ? "starred" : "non-starred"
-                    color: addressbar.bookmarked ? UbuntuColors.orange : addressbar.fgColor
+                    name: addressbar.bookmarked || webappCapableWebsite ? "starred" : "non-starred"
+                    color: getBookmarkToggleColor(webappCapableWebsite)
                 }
 
                 onClicked: addressbar.toggleBookmark()

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-05-23 15:49:49 +0000
+++ src/app/webbrowser/Browser.qml	2016-06-16 15:34:13 +0000
@@ -171,6 +171,11 @@
         readonly property string defaultVideoDevice: ""
     }
 
+    HomescreenWebappInstaller {
+        id: webappInstaller
+        dbPath: dataLocation + "/homescreen-webapps.sqlite"
+    }
+
     FocusScope {
         id: contentsContainer
         anchors.fill: parent
@@ -487,6 +492,22 @@
     Chrome {
         id: chrome
 
+            function isCurrentUrlWebappInstalled() {
+                return ((webview && browser.webappInstaller)
+                        ? browser.webappInstaller.model.contains(webview.url) : false)
+            }
+            installed: isCurrentUrlWebappInstalled()
+            onInstallWebapp: {
+                function onInstalled(id, status, errorMessage) {
+                    webappInstaller.installed.disconnect(onInstalled)
+                    chrome.installed = status
+                    console.log('installed dd ' + status)
+                }
+                webappInstaller.installed.connect(onInstalled)
+
+                webappInstaller.install(webview.url, metainfos)
+            }
+
         tab: internal.nextTab || tabsModel.currentTab
         webview: tab ? tab.webview : null
         tabsModel: browser.tabsModel
@@ -1034,6 +1055,11 @@
         asynchronous: true
     }
 
+    function webappManifestDetected(webview, metainfos) {
+        chrome.webappCapableWebsite = true
+        chrome.webappCapableMetaInfo = metainfos
+    }
+
     Component {
         id: tabComponent
 
@@ -1053,6 +1079,18 @@
                 property BrowserTab tab
                 readonly property bool current: tab.current
 
+                Component.onCompleted: {
+                    // TODO make sure that there is no race here between this and the url changed
+                    webviewimpl.context.addUserScript(webappCapableDetectorUserScript)
+
+                    var mhs = []
+                    for (var i = 0; i < messageHandlers.length; i++) {
+                        mhs.push(messageHandlers[i])
+                    }
+                    mhs.push(webappCapableDetectorMessageHandler)
+                    messageHandlers = mhs
+                }
+
                 currentWebview: browser.currentWebview
                 filePicker: filePickerLoader.item
 
@@ -1071,6 +1109,24 @@
                 preferences.appCacheEnabled: true
 
                 property QtObject contextModel: null
+
+                // Handle webapp capable webapps
+                property var webappCapableDetectorUserScript: Oxide.UserScript {
+                    context: "oxide://page-metadata-gathering/"
+                    url: Qt.resolvedUrl("page-metadata-gathering.js")
+                    incognitoEnabled: false
+                    matchAllFrames: false
+                }
+
+                property var webappCapableDetectorMessageHandler: Oxide.ScriptMessageHandler {
+                    msgId: "webapp-capable-website-detected"
+                    contexts: ["oxide://page-metadata-gathering/"]
+                    callback: function(msg, frame) {
+                        console.log('dd')
+                        webappManifestDetected(webviewimpl, msg.args)
+                    }
+                }
+
                 contextualActions: ActionList {
                     Actions.OpenLinkInNewTab {
                         objectName: "OpenLinkInNewTabContextualAction"

=== modified file 'src/app/webbrowser/CMakeLists.txt'
--- src/app/webbrowser/CMakeLists.txt	2015-12-10 09:06:06 +0000
+++ src/app/webbrowser/CMakeLists.txt	2016-06-16 15:34:13 +0000
@@ -20,6 +20,10 @@
     history-model.cpp
     limit-proxy-model.cpp
     tabs-model.cpp
+    homescreen-manifest-parser.cpp
+    homescreen-manifest-content.cpp
+    homescreen-installed-webapp-model.cpp
+    homescreen-webapp.cpp
     text-search-filter-model.cpp
 )
 

=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml	2016-02-09 22:01:57 +0000
+++ src/app/webbrowser/Chrome.qml	2016-06-16 15:34:13 +0000
@@ -54,6 +54,12 @@
         navigationBar.selectAll()
     }
 
+    property alias installed: navigationBar.installed
+    property alias webappCapableWebsite: navigationBar.webappCapableWebsite
+    property alias webappCapableMetaInfo: navigationBar.webappCapableMetaInfo
+
+    signal installWebapp(var metainfos)
+
     FocusScope {
         id: content
         anchors.fill: parent

=== added file 'src/app/webbrowser/FavoriteOptionTabs.qml'
--- src/app/webbrowser/FavoriteOptionTabs.qml	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/FavoriteOptionTabs.qml	2016-06-16 15:34:13 +0000
@@ -0,0 +1,386 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+
+Rectangle {
+    id: dialog
+
+    property bool isBookmarked: false
+    property bool isWebappInstallable: false
+    property string bookmarkTitle: ""
+
+    property var webappCapableMetaInfo
+
+    property bool installingWebapp: false
+
+    border.color: "black"
+    border.width: 2
+
+    function webappInstallationComplete() {
+        installActivityIndicator.running = false
+    }
+
+    onInstallingWebappChanged: {
+        installActivityIndicator.running = false
+        installActivityIndicator.visible = false
+        console.log('installingWebapp ' + installingWebapp)
+    }
+    onVisibleChanged: {
+        if (visible) {
+            setBookmarkTabAsSelected()
+        }
+    }
+
+    signal bookmarked()
+    signal installWebapp(var metainfos)
+
+    function setBookmarkTabAsSelected() {
+        installTabHeader.selected = false
+        installTabHeader.border.width = 2
+
+        bookmarkTabHeader.selected = true
+        bookmarkTabHeader.border.width = 0
+
+        installTabContent.visible = false
+        bookmarkTabContent.visible = true
+    }
+
+    function setInstallTabAsSelected() {
+        bookmarkTabHeader.selected = false
+        bookmarkTabHeader.border.width = 2
+
+        installTabHeader.selected = true
+        installTabHeader.border.width = 0
+
+        installTabContent.visible = true
+        bookmarkTabContent.visible = false
+    }
+
+    color: "white"
+
+    Rectangle {
+
+        anchors.centerIn: parent
+
+        height: parent.height - 2
+        width: parent.width - 2
+
+        border.color: "black"
+        border.width: 2
+
+        radius: units.gu(1)
+
+        Item {
+            id: content
+            anchors.fill: parent
+
+            Rectangle {
+                id: installTabHeader
+
+                property bool selected: true
+
+                opacity: 1
+
+                color: "white"
+
+                height: units.gu(6)
+                width: parent.width/2
+
+                anchors.right: parent.right
+                anchors.top: parent.top
+
+                border.color: "black"
+                border.width: 2
+
+                Label {
+                    anchors.centerIn: installTabHeader
+                    text: i18n.tr("Install App")
+                    font.bold: true
+                }
+            }
+            MouseArea {
+                anchors.fill: installTabHeader
+                onClicked: {
+                    if (! installTabHeader.selected) {
+                        setInstallTabAsSelected()
+                    }
+                }
+            }
+
+            Rectangle {
+                id: bookmarkTabHeader
+
+                property bool selected: false
+
+                opacity: 1
+
+                color: "white"
+
+                height: units.gu(6)
+                width: parent.width/2
+
+                anchors.right: installTabHeader.left
+                anchors.top: parent.top
+
+                border.color: "black"
+                border.width: 2
+
+                Label {
+                    anchors.centerIn: bookmarkTabHeader
+                    text: i18n.tr("Add bookmark")
+                    font.bold: true
+                }
+            }
+            MouseArea {
+                anchors.fill: bookmarkTabHeader
+                onClicked: {
+                    if (! bookmarkTabHeader.selected) {
+                        setBookmarkTabAsSelected()
+                    }
+                }
+            }
+
+            Rectangle {
+                id: bookmarkTabContent
+
+                visible: false
+
+                color: "white"
+
+                height: parent.height - units.gu(6)
+
+                anchors.right: parent.right
+                anchors.left: parent.left
+
+                anchors.top: bookmarkTabHeader.bottom
+                anchors.topMargin: units.gu(2)
+
+                Column {
+                    id: bookmarkDetailsArea
+
+                    spacing: units.gu(2)
+                    anchors.leftMargin: units.gu(2)
+
+                    anchors.fill: parent
+
+                    Label {
+                        id: bookmarkNameLabel
+
+                        text: i18n.tr("bookmark name")
+                    }
+                    TextField {
+                        id: bookmarkNameText
+                        text: bookmarkTitle
+                        width: parent.width - units.gu(2)
+                    }
+
+                    Label {
+                        id: bookmarkSaveInLabel
+
+                        text: i18n.tr("save in")
+                    }
+                    Rectangle {
+                        id: bookmarkSeparator
+                        color: "black"
+                        height: 2
+                        smooth: true
+                        width: parent.width - units.gu(2)
+                        opacity: 0.5
+                    }
+                    Label {
+                        id: bookmarkExistingNameLabel
+
+                        text: i18n.tr("All Bookmarks")
+                        fontSize: "large"
+
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: bookmarked()
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: installTabContent
+
+                visible: false
+
+                color: "white"
+
+                height: parent.height - units.gu(6)
+
+                anchors.right: parent.right
+                anchors.left: parent.left
+                anchors.top: installTabHeader.bottom
+
+                Rectangle {
+                    id: installGridImageArea
+
+                    border.width: 1
+                    border.color: "black"
+
+                    width: parent.width/2 - units.gu(3)
+                    height: parent.width/2 - units.gu(3)
+
+                    anchors.left: parent.left
+                    anchors.top: parent.top
+                    anchors.bottom: parent.bottom
+
+                    anchors.leftMargin: units.gu(3)/2
+                    anchors.rightMargin: units.gu(3)/2
+                    anchors.topMargin: units.gu(3)/2
+                    anchors.bottomMargin: units.gu(3)/2
+
+                    Item {
+                        anchors.fill: parent
+                        clip: true
+
+                        anchors.leftMargin: units.gu(3)/2
+                        anchors.rightMargin: units.gu(3)/2
+                        anchors.topMargin: units.gu(3)/2
+                        anchors.bottomMargin: units.gu(3)/2
+
+                        Column {
+                            x: parent.x - units.gu(4)
+                            y: parent.y - units.gu(4)
+
+                            Row {
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                            }
+                            Row {
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                    Label {
+                                        anchors.centerIn: parent
+                                        text: installAppName
+                                    }
+                                }
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                            }
+                            Row {
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                                UbuntuShape {
+                                    radius: "medium"
+                                    color: "#E6E4E2"
+                                    width: installGridImageArea.width/3
+                                    height: installGridImageArea.height/3
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Item {
+                    id: installButtonArea
+
+                    anchors.left: installGridImageArea.right
+                    anchors.leftMargin: units.gu(4)
+
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    anchors.topMargin: units.gu(10)
+
+                    anchors.bottom: parent.bottom
+
+                    Column {
+
+                        spacing: units.gu(4)
+                        anchors.horizontalCenter: parent.horizontalCenter
+
+                        Label {
+                            id: installLabel
+                            text: "Install "
+                                  + (webappCapableMetaInfo ? webappCapableMetaInfo.title : "")
+                                  + " to your apps"
+                            anchors.horizontalCenter: parent.horizontalCenter
+                        }
+                        Button {
+                            id: installButton
+                            text: i18n.tr("Install")
+
+                            enabled: !installingWebapp
+
+                            anchors.topMargin: units.gu(1)
+                            anchors.horizontalCenter: parent.horizontalCenter
+
+                            onClicked: {
+                                installingWebapp = true
+                                installActivityIndicator.running = true
+
+                                installWebapp(webappCapableMetaInfo)
+                            }
+
+                            ActivityIndicator {
+                                id: installActivityIndicator
+                                running: installingWebapp
+                                visible: running
+                                anchors.fill: parent
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'src/app/webbrowser/HomescreenWebappInstaller.qml'
--- src/app/webbrowser/HomescreenWebappInstaller.qml	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/HomescreenWebappInstaller.qml	2016-06-16 15:34:13 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+import QtQuick 2.0
+import webbrowserapp.private 0.1
+
+Item {
+    id: root
+
+    width: 100
+    height: 62
+
+    property var model: installedWebappsModel
+    property alias dbPath: installedWebappsModel.dbPath
+
+    HomescreenInstalledWebappModel {
+        id: installedWebappsModel
+    }
+
+    HomescreenWebapp {
+        id: homescreenWebapp
+        onInstalled: {
+            if (status && 0) {
+                installedWebappsModel.addInstalledWebapp(
+                    "clickPackageName",
+                    "domain",
+                    "name",
+                    "homepage",
+                    (new Date().getTime()) / 1000)
+            }
+            root.installed(id, status, errorMessage)
+        }
+    }
+
+    QtObject {
+        id: internal
+        property int nextRequestId: 0
+        property var requestIds
+    }
+
+    signal installed(int id, bool status, string errorMessage)
+
+    function __areValidMetaInfos(metaInfos) {
+        return true
+    }
+    function __buildResourceRequests(requestId, metaInfos) {
+        if (metaInfos.type === 'apple') {
+            // we have everything besides the icons
+            return {
+                start: function(callback) {
+                    callback(requestId, {
+                         success: true,
+                         errorMessage: "",
+                         response: {
+                            short_name: metaInfos.title,
+                            name: metaInfos.title,
+                            icons: metaInfos.icons,
+                            start_url: metaInfos.baseurl,
+                            display: "standalone"
+                         }
+                    })
+                }
+            }
+        } else if (metaInfos.type === 'manifest') {
+            return {
+                start: function(callback) {
+                    __requestResource(
+                        metaInfos.manifest,
+                        function(result) {
+                            if (result.success) {
+                                try {
+                                    result.response =
+                                        JSON.parse(result.response)
+                                } catch(e) { }
+                            }
+                            callback(requestId, result)
+                        })
+                }
+            }
+        }
+        return null
+    }
+
+    // TODO add UA, cookies etc.?
+    function __requestResource(url, callback) {
+        var xmlrequest = new XMLHttpRequest();
+        xmlrequest.open("GET", url, true);
+        xmlrequest.onreadystatechange = function() {
+            if (xmlrequest.readyState === XMLHttpRequest.DONE) {
+                callback({
+                    errorMessage: xmlrequest.statusText,
+                    success: xmlrequest.status == 200,
+                    // TODO: EVIL
+                    response: eval(xmlrequest.responseText)
+                });
+            }
+        };
+        xmlrequest.send(null);
+    }
+
+    function __onResourceGathered(requestId, result) {
+        if (!result.success) {
+            installed(false, result.errorMessage)
+            return
+        }
+        homescreenWebapp.install(
+            requestId,
+            result.response.short_name,
+            result.response.name,
+            result.response.start_url,
+            result.response.icons)
+    }
+
+    function install(url, metaInfos) {
+        if (installedWebappsModel.hasWebappForUrlDomain(url)) {
+            // already installed
+            installed(true)
+            return
+        }
+
+        if ( ! internal.requestIds) {
+            internal.requestIds = {}
+        }
+
+        if ( ! __areValidMetaInfos(metaInfos)) {
+            installed(-1, false, i18n.tr("Invalid webapp meta information"))
+            return
+        }
+
+        var id = internal.nextRequestId
+        var requests = __buildResourceRequests(id, metaInfos)
+        if ( ! requests) {
+            return -1
+        }
+        requests.start(__onResourceGathered)
+        internal.nextRequestId++
+
+        return id
+    }
+
+    function cancel(id) { }
+}

=== modified file 'src/app/webbrowser/NavigationBar.qml'
--- src/app/webbrowser/NavigationBar.qml	2016-05-17 17:23:42 +0000
+++ src/app/webbrowser/NavigationBar.qml	2016-06-16 15:34:13 +0000
@@ -44,6 +44,12 @@
     onFindInPageModeChanged: if (findInPageMode) addressbar.text = ""
     onIncognitoChanged: findInPageMode = false
 
+    property bool installed: false
+    property alias webappCapableWebsite: addressbar.webappCapableWebsite
+    property alias webappCapableMetaInfo: favoriteView.webappCapableMetaInfo
+
+    signal installWebapp(var metainfos)
+
     function selectAll() {
         addressbar.selectAll()
     }
@@ -235,6 +241,41 @@
         }
     }
 
+    onInstalledChanged: {
+        console.log('onInstalledChanged ' + installed)
+        favoriteView.installingWebapp = false
+    }
+
+    FavoriteOptionTabs {
+        id: favoriteView
+
+        visible: false
+
+        height: units.gu(35)
+
+        isWebappInstallable: webappCapableWebsite
+
+        bookmarkTitle: chrome.webview.title
+
+        anchors.left: parent.left
+        anchors.leftMargin: units.gu(1)
+
+        anchors.right: parent.right
+        anchors.rightMargin: units.gu(1)
+
+        anchors.top: parent.bottom
+        anchors.topMargin: units.gu(2)
+
+        onBookmarked: {
+            addressbar.bookmarked = !addressbar.bookmarked
+            favoriteView.visible = false
+        }
+        onInstallWebapp: {
+            console.log('meta infos: ' + JSON.stringify(metainfos))
+            chrome.installWebapp(metainfos)
+        }
+    }
+
     Component {
         id: drawerComponent
 

=== added file 'src/app/webbrowser/homescreen-installed-webapp-model.cpp'
--- src/app/webbrowser/homescreen-installed-webapp-model.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-installed-webapp-model.cpp	2016-06-16 15:34:13 +0000
@@ -0,0 +1,342 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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 "homescreen-installed-webapp-model.h"
+
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QDateTime>
+
+
+namespace {
+
+const char *kConnectionName = "homescreen-webapps";
+const char *kDbName = "installed-homescreen-webapps.sqlite";
+
+}
+
+class HomescreenInstalledWebappModelPrivate
+{
+public:
+
+    struct HomescreenInstalledWebapp {
+        QString clickPackageName;
+        QString domain;
+        QString name;
+        QUrl homepage;
+        QDateTime installedTime;
+    };
+
+
+public:
+
+    HomescreenInstalledWebappModelPrivate();
+    ~HomescreenInstalledWebappModelPrivate();
+
+    void initDatabase();
+    void createDbSchemaIfNecessary();
+    void syncFromDatabase();
+
+    int count() const;
+    int findWithDomain(const QString& domain) const;
+    void removeWithDomain(const QString& domain);
+    void removeWithClickPackageName(const QString& clickPackageName);
+
+    const HomescreenInstalledWebapp at(int index) const;
+    void add(const QString& clickPackageName,
+             const QString& domain,
+             const QString& name,
+             const QUrl& homepage,
+             const QDateTime& installedTime);
+
+    QString _dbPath;
+    QSqlDatabase _db;
+    QList<HomescreenInstalledWebapp> _installedWebapps;
+};
+
+
+HomescreenInstalledWebappModelPrivate::HomescreenInstalledWebappModelPrivate()
+{
+    _db = QSqlDatabase::addDatabase("QSQLITE", kConnectionName);
+}
+
+HomescreenInstalledWebappModelPrivate::~HomescreenInstalledWebappModelPrivate()
+{
+    if (_db.isOpen() && _db.isValid()) {
+        _db.close();
+    }
+}
+
+void HomescreenInstalledWebappModelPrivate::initDatabase()
+{
+    if (_db.isOpen()) {
+        _db.close();
+    }
+
+    _db.setDatabaseName(kDbName);
+    if (!_db.open()) {
+        return;
+    }
+
+    createDbSchemaIfNecessary();
+    syncFromDatabase();
+}
+
+int HomescreenInstalledWebappModelPrivate::count() const
+{
+    return _installedWebapps.count();
+}
+
+const HomescreenInstalledWebappModelPrivate::HomescreenInstalledWebapp
+HomescreenInstalledWebappModelPrivate::at(int index) const
+{
+    if (_installedWebapps.count() < index && index >= 0) {
+        return _installedWebapps.at(index);
+    }
+    return HomescreenInstalledWebapp();
+}
+
+int HomescreenInstalledWebappModelPrivate::findWithDomain(
+        const QString& domain) const
+{
+    int index = 0;
+    Q_FOREACH(HomescreenInstalledWebapp webapp, _installedWebapps)
+    {
+        if (webapp.domain == domain) {
+            return index;
+        }
+        ++index;
+    }
+    return -1;
+}
+
+void HomescreenInstalledWebappModelPrivate::syncFromDatabase()
+{
+    _installedWebapps.clear();
+
+    QSqlQuery q(_db);
+
+    q.prepare(
+        QLatin1String(
+            "SELECT clickPackageName, domain, name, homepage, installedTime "
+            "FROM webapps;"));
+    q.exec();
+
+    int count = 0;
+    while (q.next()) {
+
+        HomescreenInstalledWebapp webapp;
+
+        webapp.clickPackageName = q.value(0).toString();
+        webapp.domain = q.value(1).toString();
+        webapp.name = q.value(2).toString();
+        webapp.homepage = q.value(3).toUrl();
+        webapp.installedTime = QDateTime::fromTime_t(q.value(4).toInt());
+
+//        beginInsertRows(QModelIndex(), count, count);
+        _installedWebapps.append(webapp);
+//        endInsertRows();
+
+        ++count;
+    }
+}
+
+void HomescreenInstalledWebappModelPrivate::add(
+        const QString& clickPackageName,
+        const QString& domain,
+        const QString& name,
+        const QUrl& homepage,
+        const QDateTime& installedTime)
+{
+    QSqlQuery q(_db);
+
+    q.prepare(
+        "INSERT INTO webapps ("
+        "clickPackageName, "
+        "domain, "
+        "name, "
+        "homepage, "
+        "installedTime) VALUES (?, ?, ?, ?, ?);");
+
+    q.addBindValue(clickPackageName);
+    q.addBindValue(domain);
+    q.addBindValue(name);
+    q.addBindValue(homepage.toString());
+    q.addBindValue(installedTime.toTime_t());
+
+    q.exec();
+}
+
+void HomescreenInstalledWebappModelPrivate::removeWithDomain(const QString& domain)
+{
+    QSqlQuery q(_db);
+
+    q.prepare("DELETE FROM webapps WHERE domain=?;");
+
+    q.addBindValue(domain);
+
+    q.exec();
+}
+
+void HomescreenInstalledWebappModelPrivate::removeWithClickPackageName(
+        const QString& clickPackageName)
+{
+    QSqlQuery q(_db);
+
+    q.prepare("DELETE FROM webapps WHERE clickPackageName=?;");
+
+    q.addBindValue(clickPackageName);
+
+    q.exec();
+}
+
+void HomescreenInstalledWebappModelPrivate::createDbSchemaIfNecessary()
+{
+    QSqlQuery q(_db);
+
+    q.prepare(
+        "CREATE TABLE IF NOT EXISTS webapps "
+        "(clickPackageName VARCHAR, "
+        "domain VARCHAR PRIMARY KEY, "
+        "name VARCHAR, "
+        "homepage VARCHAR, "
+        "installedTime DATETIME);");
+
+    q.exec();
+}
+
+
+
+HomescreenInstalledWebappModel::HomescreenInstalledWebappModel(QObject *parent) :
+    QAbstractListModel(parent),
+    d_ptr(new HomescreenInstalledWebappModelPrivate())
+{}
+
+HomescreenInstalledWebappModel::~HomescreenInstalledWebappModel()
+{
+    delete d_ptr;
+}
+
+void HomescreenInstalledWebappModel::addInstalledWebapp(
+        const QString& clickPackageName,
+        const QString& domain,
+        const QString& name,
+        const QUrl& homepage,
+        int installedTime)
+{
+    Q_D(HomescreenInstalledWebappModel);
+    if (d->findWithDomain(domain) != -1) {
+        return;
+    }
+    d->add(clickPackageName, domain, name, homepage, QDateTime::fromTime_t(installedTime));
+    // TODO overkill
+    d->syncFromDatabase();
+}
+
+bool HomescreenInstalledWebappModel::hasWebappForUrlDomain(
+        const QUrl& url) const
+{
+    Q_D(const HomescreenInstalledWebappModel);
+    return d->findWithDomain(url.host()) != -1;
+}
+
+void HomescreenInstalledWebappModel::removeForUrl(
+        const QUrl& url)
+{
+    Q_D(HomescreenInstalledWebappModel);
+    d->removeWithDomain(url.host());
+    // TODO overkill
+    d->syncFromDatabase();
+}
+
+void HomescreenInstalledWebappModel::removeClickName(
+        const QString& clickPackageNAme)
+{
+    Q_D(HomescreenInstalledWebappModel);
+    d->removeWithClickPackageName(clickPackageNAme);
+    // TODO overkill
+    d->syncFromDatabase();
+}
+
+QHash<int, QByteArray> HomescreenInstalledWebappModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles;
+    if (roles.isEmpty()) {
+        roles[ClickPackageName] = "clickPackageName";
+        roles[Domain] = "domain";
+        roles[Name] = "name";
+        roles[Homepage] = "homepage";
+        roles[InstalledTime] = "installedTime";
+    }
+    return roles;
+}
+
+int HomescreenInstalledWebappModel::rowCount(const QModelIndex& ) const
+{
+    Q_D(const HomescreenInstalledWebappModel);
+    return d->count();
+}
+
+QVariant HomescreenInstalledWebappModel::data(const QModelIndex& index, int role) const
+{
+    Q_D(const HomescreenInstalledWebappModel);
+
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    const HomescreenInstalledWebappModelPrivate::HomescreenInstalledWebapp& webapp =
+            d->at(index.row());
+
+    switch (role) {
+    case ClickPackageName:
+        return webapp.homepage;
+    case Domain:
+        return webapp.domain;
+    case Name:
+        return webapp.name;
+    case Homepage:
+        return webapp.homepage;
+    case InstalledTime:
+        return webapp.installedTime;
+    default:
+        break;
+    }
+
+    return QVariant();
+}
+
+const QString HomescreenInstalledWebappModel::dbPath() const
+{
+    Q_D(const HomescreenInstalledWebappModel);
+
+    return d->_dbPath;
+}
+
+void HomescreenInstalledWebappModel::setDbPath(const QString& path)
+{
+    Q_D(HomescreenInstalledWebappModel);
+
+    if (path == d->_dbPath)
+    {
+        return;
+    }
+
+    d->_dbPath = path;
+    Q_EMIT dbPathChanged();
+}

=== added file 'src/app/webbrowser/homescreen-installed-webapp-model.h'
--- src/app/webbrowser/homescreen-installed-webapp-model.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-installed-webapp-model.h	2016-06-16 15:34:13 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef _HOMESCREEN_INSTALLED_WEBAPP_MODEL_H_
+#define _HOMESCREEN_INSTALLED_WEBAPP_MODEL_H_
+
+#include <QtCore/QAbstractListModel>
+#include <QUrl>
+#include <QString>
+#include <QStringList>
+#include <QScopedPointer>
+
+
+class HomescreenInstalledWebappModelPrivate;
+
+//TODO handle the case of the click being removed offline by the user
+
+class HomescreenInstalledWebappModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString dbPath READ dbPath WRITE setDbPath NOTIFY dbPathChanged)
+    Q_ENUMS(Roles)
+
+public:
+
+    enum Roles {
+        ClickPackageName = Qt::UserRole + 1,
+        Domain,
+        Name,
+        Homepage,
+        InstalledTime
+    };
+
+    explicit HomescreenInstalledWebappModel(QObject *parent = 0);
+    ~HomescreenInstalledWebappModel();
+
+    // QAbstractListModel
+    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex& parent=QModelIndex()) const;
+    QVariant data(const QModelIndex& index, int role) const;
+
+    const QString dbPath() const;
+    void setDbPath(const QString& path);
+
+    Q_INVOKABLE void addInstalledWebapp(const QString& clickPackageName,
+                                        const QString& domain,
+                                        const QString& name,
+                                        const QUrl& homepage,
+                                        int installedTime);
+
+    Q_INVOKABLE bool hasWebappForUrlDomain(
+            const QUrl& url) const;
+
+    Q_INVOKABLE void removeForUrl(
+            const QUrl& url);
+
+    Q_INVOKABLE void removeClickName(
+            const QString& clickPackageNAme);
+
+
+Q_SIGNALS:
+    void dbPathChanged();
+
+
+private:
+    HomescreenInstalledWebappModelPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(HomescreenInstalledWebappModel)
+};
+
+#endif // _HOMESCREEN_INSTALLED_WEBAPP_MODEL_H_

=== added file 'src/app/webbrowser/homescreen-manifest-content.cpp'
--- src/app/webbrowser/homescreen-manifest-content.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-manifest-content.cpp	2016-06-16 15:34:13 +0000
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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 "homescreen-manifest-content.h"
+
+
+class WebappIconDescriptionPrivate
+{
+public:
+
+    WebappIconDescriptionPrivate(
+            const QString& src,
+            const QString& sizes,
+            const QString& type,
+            const QString& density)
+        : _src(src),
+          _sizes(sizes),
+          _type(type),
+          _density(density)
+    {}
+
+    QString _src;
+    QString _sizes;
+    QString _type;
+    QString _density;
+};
+
+WebappIconDescription::WebappIconDescription(
+        const QString& src,
+        const QString& sizes,
+        const QString& type,
+        const QString& density,
+        QObject* parent) :
+    QObject(parent),
+    d_ptr(new WebappIconDescriptionPrivate(
+              src, sizes, type, density))
+{}
+
+WebappIconDescription::~WebappIconDescription()
+{
+    delete d_ptr;
+}
+
+QString WebappIconDescription::src() const
+{
+    Q_D(const WebappIconDescription);
+    return d->_src;
+}
+
+QString WebappIconDescription::sizes() const
+{
+    Q_D(const WebappIconDescription);
+    return d->_sizes;
+}
+
+QString WebappIconDescription::type() const
+{
+    Q_D(const WebappIconDescription);
+    return d->_type;
+}
+
+QString WebappIconDescription::density() const
+{
+    Q_D(const WebappIconDescription);
+    return d->_density;
+}
+
+
+class HomescreenManifestContentPrivate
+{
+public:
+
+    HomescreenManifestContentPrivate(
+            const QString& name,
+            const QString& startUrl,
+            const QString& display,
+            HomescreenManifestContent::Orientation orientation,
+            const QList<WebappIconDescription*>& icons)
+        : _name(name),
+          _startUrl(startUrl),
+          _display(display),
+          _orientation(orientation),
+          _icons(icons)
+    {}
+
+    QString _name;
+    QString _startUrl;
+    QString _display;
+    HomescreenManifestContent::Orientation _orientation;
+    QList<WebappIconDescription*> _icons;
+};
+
+HomescreenManifestContent::HomescreenManifestContent(
+        const QString& name,
+        const QString& startUrl,
+        const QString& display,
+        Orientation orientation,
+        const QList<WebappIconDescription*>& icons,
+        QObject* parent) :
+    QObject(parent),
+    d_ptr(new HomescreenManifestContentPrivate(
+              name, startUrl, display, orientation, icons))
+{}
+
+HomescreenManifestContent::~HomescreenManifestContent()
+{
+    delete d_ptr;
+}
+
+QString HomescreenManifestContent::name() const
+{
+    Q_D(const HomescreenManifestContent);
+    return d->_name;
+}
+void HomescreenManifestContent::setName(const QString& name)
+{
+    Q_D(HomescreenManifestContent);
+    d->_name = name;
+}
+
+QString HomescreenManifestContent::startUrl() const
+{
+    Q_D(const HomescreenManifestContent);
+    return d->_startUrl;
+}
+void HomescreenManifestContent::setStartUrl(const QString& url)
+{
+    Q_D(HomescreenManifestContent);
+    d->_startUrl = url;
+}
+
+QString HomescreenManifestContent::display() const
+{
+    Q_D(const HomescreenManifestContent);
+    return d->_display;
+}
+void HomescreenManifestContent::setDisplay(const QString& display)
+{
+    Q_D(HomescreenManifestContent);
+    d->_display = display;
+}
+
+HomescreenManifestContent::Orientation HomescreenManifestContent::orientation() const
+{
+    Q_D(const HomescreenManifestContent);
+    return d->_orientation;
+}
+void HomescreenManifestContent::setOrientation(
+        HomescreenManifestContent::Orientation orientation)
+{
+    Q_D(HomescreenManifestContent);
+    d->_orientation = orientation;
+}
+
+QList<WebappIconDescription*> HomescreenManifestContent::icons() const
+{
+    Q_D(const HomescreenManifestContent);
+    return d->_icons;
+}
+void HomescreenManifestContent::setIcons(
+        const QList<WebappIconDescription*>& icons)
+{
+    Q_D(HomescreenManifestContent);
+    d->_icons = icons;
+}

=== added file 'src/app/webbrowser/homescreen-manifest-content.h'
--- src/app/webbrowser/homescreen-manifest-content.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-manifest-content.h	2016-06-16 15:34:13 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef _HOMESCREEN_MANIFEST_CONTENT_H_
+#define _HOMESCREEN_MANIFEST_CONTENT_H_
+
+#include <QObject>
+#include <QString>
+#include <QList>
+#include <QScopedPointer>
+
+
+class WebappIconDescriptionPrivate;
+
+class WebappIconDescription: public QObject
+{
+public:
+    Q_OBJECT
+    Q_PROPERTY(QString src READ src)
+    Q_PROPERTY(QString sizes READ sizes)
+    Q_PROPERTY(QString type READ type)
+    Q_PROPERTY(QString density READ density)
+
+public:
+
+    WebappIconDescription(
+        const QString& src,
+        const QString& sizes,
+        const QString& type,
+        const QString& density,
+        QObject* parent = 0);
+    ~WebappIconDescription();
+
+    QString src() const;
+    QString sizes() const;
+    QString type() const;
+    QString density() const;
+
+private:
+    WebappIconDescriptionPrivate* d_ptr;
+    Q_DECLARE_PRIVATE(WebappIconDescription)
+};
+
+
+class HomescreenManifestContentPrivate;
+class HomescreenManifestContent : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name)
+    Q_PROPERTY(QString startUrl READ startUrl)
+    Q_PROPERTY(QString display READ display)
+    Q_PROPERTY(Orientation orientation READ orientation)
+    Q_PROPERTY(QList<WebappIconDescription*> icons READ icons)
+    Q_ENUMS(Orientation)
+
+
+public:
+    enum Orientation
+    {
+        LANDSCAPE,
+        PORTRAIT
+    };
+
+    HomescreenManifestContent(
+        const QString& name,
+        const QString& startUrl,
+        const QString& display,
+        Orientation orientation,
+        const QList<WebappIconDescription*>& icons,
+        QObject* parent = 0);
+    HomescreenManifestContent(QObject* parent = 0);
+    ~HomescreenManifestContent();
+
+    QString name() const;
+    void setName(const QString&);
+
+    QString startUrl() const;
+    void setStartUrl(const QString&);
+
+    QString display() const;
+    void setDisplay(const QString&);
+
+    Orientation orientation() const;
+    void setOrientation(Orientation);
+
+    QList<WebappIconDescription*> icons() const;
+    void setIcons(const QList<WebappIconDescription*>&);
+
+private:
+    HomescreenManifestContentPrivate* d_ptr;
+    Q_DECLARE_PRIVATE(HomescreenManifestContent)
+};
+
+#endif // _HOMESCREEN_MANIFEST_CONTENT_H_

=== added file 'src/app/webbrowser/homescreen-manifest-parser.cpp'
--- src/app/webbrowser/homescreen-manifest-parser.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-manifest-parser.cpp	2016-06-16 15:34:13 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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 "homescreen-manifest-parser.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonValue>
+
+#include "homescreen-manifest-content.h"
+
+
+namespace {
+
+const char WEBAPP_NAME_KEY[] = "name";
+const char WEBAPP_START_URL_KEY[] = "start_url";
+const char WEBAPP_DISPLAY_KEY[] = "display";
+const char WEBAPP_ORIENTATION_KEY[] = "orientation";
+
+// icons
+const char WEBAPP_ICONS_KEY[] = "icons";
+
+const char WEBAPP_ICON_SRC_KEY[] = "src";
+const char WEBAPP_ICON_SIZES_KEY[] = "sizes";
+const char WEBAPP_ICON_TYPE_KEY[] = "type";
+const char WEBAPP_ICON_DENSITY_KEY[] = "density";
+
+}
+
+
+HomescreenManifestParser::HomescreenManifestParser(
+        QObject *parent)
+    : QObject(parent)
+{}
+
+bool HomescreenManifestParser::parse(
+        const QString& content,
+        HomescreenManifestContent & out,
+        QString& errorMessage)
+{
+    if (content.isEmpty())
+    {
+        errorMessage = "Empty manifest content";
+        return false;
+    }
+
+    //
+    QJsonParseError error;
+    QJsonDocument doc = QJsonDocument::fromJson(content.toUtf8(), &error);
+    if (error.error != QJsonParseError::NoError)
+    {
+        errorMessage = "Could not parse manifest content";
+        return false;
+    }
+
+    if (doc.isNull() || !doc.isObject())
+    {
+        errorMessage = "Could not parse manifest content: invalid content";
+        return false;
+    }
+
+    QJsonObject root = doc.object();
+    if ( ! root.contains(WEBAPP_NAME_KEY))
+    {
+        errorMessage = "Invalid manifest content: no 'name' found";
+        return false;
+    }
+
+    QString name = root.value(WEBAPP_NAME_KEY).toString();
+
+    if ( ! root.contains(WEBAPP_ICONS_KEY))
+    {
+        errorMessage = "Invalid manifest content: no 'icons' found";
+        return false;
+    }
+
+    QList<WebappIconDescription*> iconDescriptions;
+
+    QJsonValue iconsValue = root.value(WEBAPP_ICONS_KEY);
+    if (iconsValue.isArray())
+    {
+        QJsonArray icons = iconsValue.toArray();
+        Q_FOREACH(QJsonValue iconValue, icons)
+        {
+            if (! iconValue.isObject())
+            {
+                continue;
+            }
+            QJsonObject icon = iconValue.toObject();
+            if (icon.contains(WEBAPP_ICON_SRC_KEY))
+            {
+                iconDescriptions.append(
+                    new WebappIconDescription(
+                        icon.value(WEBAPP_ICON_SRC_KEY).toString(),
+                        icon.value(WEBAPP_ICON_SIZES_KEY).toString(),
+                        icon.value(WEBAPP_ICON_TYPE_KEY).toString(),
+                        icon.value(WEBAPP_ICON_DENSITY_KEY).toString()));
+            }
+        }
+    }
+
+    if (iconDescriptions.empty())
+    {
+        errorMessage = "Invalid manifest content: empty 'icons'";
+        return false;
+    }
+
+    out.setName(name);
+//    out.setOrientation(root.value(WEBAPP_DISPLAY_KEY).toString());
+    out.setStartUrl(root.value(WEBAPP_START_URL_KEY).toString());
+    out.setIcons(iconDescriptions);
+    out.setDisplay(root.value(WEBAPP_DISPLAY_KEY).toString());
+
+    return true;
+}

=== added file 'src/app/webbrowser/homescreen-manifest-parser.h'
--- src/app/webbrowser/homescreen-manifest-parser.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-manifest-parser.h	2016-06-16 15:34:13 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef _HOMESCREEN_MANIFEST_PARSER_H_
+#define _HOMESCREEN_MANIFEST_PARSER_H_
+
+#include <QObject>
+#include <QUrl>
+#include <QString>
+
+
+class HomescreenManifestContent;
+
+class HomescreenManifestParser : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit HomescreenManifestParser(QObject *parent = 0);
+
+    bool parse(const QString& content,
+               HomescreenManifestContent & out,
+               QString& errorMessage);
+};
+
+#endif // _HOMESCREEN_MANIFEST_PARSER_H_

=== added file 'src/app/webbrowser/homescreen-manifest-request.cpp'
--- src/app/webbrowser/homescreen-manifest-request.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-manifest-request.cpp	2016-06-16 15:34:13 +0000
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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 "homescreen-manifest-request.h"
+
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+#include "homescreen-manifest-content.h"
+
+
+class HomescreenManifestRequestPrivate : public QObject
+{
+    Q_OBJECT
+
+public:
+    HomescreenManifestRequestPrivate(QObject *parent = 0);
+
+    void parse();
+
+
+Q_SIGNALS:
+    void parsed(HomescreenManifestContent *,
+                const QString& errorMEssage);
+
+private Q_SLOTS:
+    void requestFinished();
+
+private:
+    friend class HomescreenManifestRequest;
+
+    QString _manifestFilename;
+    QUrl _baseUrl;
+    QUrl _referrer;
+    QString _userAgent;
+};
+
+HomescreenManifestRequestPrivate::HomescreenManifestRequestPrivate(
+        QObject *parent)
+    : QObject(parent)
+{}
+
+void HomescreenManifestRequestPrivate::parse()
+{
+    if (_manifestFilename.isEmpty()
+            || _baseUrl.isEmpty())
+    {
+        Q_EMIT parsed(NULL, "No manifest to retrieve and parse");
+        return;
+    }
+    QNetworkRequest request(_baseUrl);
+    if (!_userAgent.isEmpty())
+    {
+        request.setRawHeader("User-Agent", _userAgent.toUtf8());
+    }
+    if (!_referrer.isEmpty())
+    {
+        request.setRawHeader("Referer", _referrer.toUtf8());
+    }
+
+    QNetworkAccessManager manager;
+
+    QNetworkReply * reply = manager.get(request);
+
+    QObject::connect(
+        reply, SIGNAL(finished()),
+        this, SLOT(requestFinished()));
+
+}
+
+void HomescreenManifestRequestPrivate::requestFinished()
+{
+    QNetworkReply *reply = qobject_cast(sender());
+    if (Q_UNLIKELY(! reply))
+    {
+        Q_EMIT parsed(NULL, "Invalid reply");
+        return;
+    }
+
+    QString manifestContent =
+        QString::fromUtf8(reply->readAll());
+}
+
+
+HomescreenManifestRequest::HomescreenManifestRequest(
+        QObject *parent) :
+    QObject(parent),
+    d_ptr(new HomescreenManifestRequestPrivate())
+{}
+
+HomescreenManifestRequest::HomescreenManifestRequest(
+        QObject *parent)
+    : QObject(parent)
+{}
+
+QString HomescreenManifestRequest::manifestFilename() const
+{
+    Q_D(const HomescreenManifestRequest);
+
+    return d->_manifestFilename;
+}
+
+void HomescreenManifestRequest::setManifestFilename(
+        const QString& manifest)
+{
+    Q_D(HomescreenManifestRequest);
+
+    if (d->_manifestFilename == manifest)
+    {
+        return;
+    }
+    d->_manifestFilename = manifest;
+    Q_EMIT manifestFilenameChanged();
+}
+
+QUrl HomescreenManifestRequest::baseUrl() const
+{
+    Q_D(HomescreenManifestRequest);
+
+}
+
+void HomescreenManifestRequest::setBaseUrl(
+        const QUrl& url)
+{
+    Q_D(HomescreenManifestRequest);
+
+    if (d->_baseUrl == url)
+    {
+        return;
+    }
+    d->_baseUrl = url;
+    Q_EMIT baseUrlChanged();
+}
+
+QUrl HomescreenManifestRequest::referrer() const
+{
+}
+
+void HomescreenManifestRequest::setReferrer(const QUrl& referrer)
+{
+
+}
+
+QString HomescreenManifestRequest::userAgent() const
+{
+
+}
+
+void HomescreenManifestRequest::setUserAgent(const QString& userAgent)
+{
+
+}
+
+void HomescreenManifestRequest::parse()
+{
+    HomescreenManifestContent content;
+
+    Q_NETWORK_EXPORT
+    Q_EMIT parsed(&content);
+}

=== added file 'src/app/webbrowser/homescreen-manifest-request.h'
--- src/app/webbrowser/homescreen-manifest-request.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-manifest-request.h	2016-06-16 15:34:13 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef _HOMESCREEN_MANIFEST_PARSER_H_
+#define _HOMESCREEN_MANIFEST_PARSER_H_
+
+#include <QObject>
+#include <QUrl>
+#include <QString>
+#include <QScopedPointer>
+
+
+class QNetworkReply;
+
+class HomescreenManifestRequestPrivate;
+
+class HomescreenManifestRequest : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit HomescreenManifestRequest(QObject *parent = 0);
+
+    enum ResourceType
+    {
+        MAIN_MANIFEST_TYPE,
+        ICN_RESOURCE
+    };
+
+    void get(const QUrl& manifestUrl);
+    void getIcons(const QUrl& manifestUrl);
+
+
+Q_SIGNALS:
+    void failure(const QString& resourceName, ResourceType type);
+    void finished(const QString& content);
+
+
+private:
+
+    QScopedPointer<HomescreenManifestRequestPrivate>* d_ptr;
+    Q_DECLARE_PRIVATE(HomescreenManifestParser)
+};
+
+#endif // _HOMESCREEN_MANIFEST_PARSER_H_

=== added file 'src/app/webbrowser/homescreen-webapp-model.cpp'
--- src/app/webbrowser/homescreen-webapp-model.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-webapp-model.cpp	2016-06-16 15:34:13 +0000
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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 "homescreen-webapp-model.h"
+
+#include <QtSql/QSqlQuery>
+
+
+HomescreenWebappModel::HomescreenWebappModel(QObject* parent)
+    : QAbstractListModel(parent)
+{
+    m_database = QSqlDatabase::addDatabase(
+                QLatin1String("QSQLITE"), "homescreen");
+}
+
+HomescreenWebappModel::~HomescreenWebappModel()
+{
+    m_database.close();
+    m_database = QSqlDatabase();
+    QSqlDatabase::removeDatabase(CONNECTION_NAME);
+}
+
+QString HomescreenWebappModel::dbPath() const
+{
+    return m_dbPath;
+}
+
+void HomescreenWebappModel::setDbPath(const QString& path)
+{
+    if (m_dbPath == path) {
+        return;
+    }
+    m_dbPath = path;
+    Q_EMIT dbPathChanged();
+}
+
+bool HomescreenWebappModel::contains(const QUrl& url)
+{
+    return false;
+}
+
+void HomescreenWebappModel::add(const QUrl& url)
+{
+}
+
+void HomescreenWebappModel::createOrAlterDatabaseSchema()
+{
+    QSqlQuery createQuery(m_database);
+    QString query = QLatin1String("CREATE TABLE IF NOT EXISTS history "
+                                  "(url VARCHAR, domain VARCHAR, title VARCHAR,"
+                                  " icon VARCHAR, visits INTEGER, lastVisit DATETIME);");
+    createQuery.prepare(query);
+    createQuery.exec();
+}
+
+void HomescreenWebappModel::populateFromDatabase()
+{
+    QSqlQuery populateQuery(m_database);
+    QString query = QLatin1String("SELECT url, domain, title, icon, visits, lastVisit "
+                                  "FROM history ORDER BY lastVisit DESC;");
+    populateQuery.prepare(query);
+    populateQuery.exec();
+
+    int count = 0;
+    while (populateQuery.next()) {
+        HistoryEntry entry;
+        entry.url = populateQuery.value(0).toUrl();
+        entry.domain = populateQuery.value(1).toString();
+        if (entry.domain.isEmpty()) {
+            entry.domain = DomainUtils::extractTopLevelDomainName(entry.url);
+        }
+        entry.title = populateQuery.value(2).toString();
+        entry.icon = populateQuery.value(3).toUrl();
+        entry.visits = populateQuery.value(4).toInt();
+        entry.lastVisit = QDateTime::fromTime_t(populateQuery.value(5).toInt());
+        beginInsertRows(QModelIndex(), count, count);
+        m_entries.append(entry);
+        endInsertRows();
+        ++count;
+    }
+}
+
+QHash<int, QByteArray> HomescreenWebappModel::roleNames() const
+{
+    static QHash<int, QByteArray> roles;
+    if (roles.isEmpty()) {
+        roles[Url] = "url";
+        roles[Domain] = "domain";
+        roles[Title] = "title";
+        roles[Icon] = "icon";
+        roles[Visits] = "visits";
+        roles[LastVisit] = "lastVisit";
+        roles[LastVisitDate] = "lastVisitDate";
+    }
+    return roles;
+}
+
+int HomescreenWebappModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+    return m_entries.count();
+}
+
+QVariant HomescreenWebappModel::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+    const HistoryEntry& entry = m_entries.at(index.row());
+    switch (role) {
+    case Url:
+        return entry.url;
+    case Domain:
+        return entry.domain;
+    case Title:
+        return entry.title;
+    case Icon:
+        return entry.icon;
+    case Visits:
+        return entry.visits;
+    case LastVisit:
+        return entry.lastVisit;
+    case LastVisitDate:
+        return entry.lastVisit.toLocalTime().date();
+    default:
+        return QVariant();
+    }
+}
+
+const QString HomescreenWebappModel::databasePath() const
+{
+    return m_database.databaseName();
+}
+
+void HomescreenWebappModel::setDatabasePath(const QString& path)
+{
+    if (path != databasePath()) {
+        if (path.isEmpty()) {
+            resetDatabase(":memory:");
+        } else {
+            resetDatabase(path);
+        }
+        Q_EMIT databasePathChanged();
+    }
+}
+
+int HomescreenWebappModel::getEntryIndex(const QUrl& url) const
+{
+    for (int i = 0; i < m_entries.count(); ++i) {
+        if (m_entries.at(i).url == url) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+/*!
+    Add an entry to the model.
+
+    If an entry with the same URL already exists, it is updated.
+    Otherwise a new entry is created and added to the model.
+
+    Return the total number of visits for the URL.
+*/
+int HomescreenWebappModel::add(const QUrl& url, const QString& title, const QUrl& icon)
+{
+    if (url.isEmpty()) {
+        return 0;
+    }
+    int count = 1;
+    QDateTime now = QDateTime::currentDateTimeUtc();
+    int index = getEntryIndex(url);
+    if (index == -1) {
+        HistoryEntry entry;
+        entry.url = url;
+        entry.domain = DomainUtils::extractTopLevelDomainName(url);
+        entry.title = title;
+        entry.icon = icon;
+        entry.visits = 1;
+        entry.lastVisit = now;
+        beginInsertRows(QModelIndex(), 0, 0);
+        m_entries.prepend(entry);
+        endInsertRows();
+        insertNewEntryInDatabase(entry);
+    } else {
+        QVector<int> roles;
+        roles << Visits;
+        if (index == 0) {
+            HistoryEntry& entry = m_entries.first();
+            if (title != entry.title) {
+                entry.title = title;
+                roles << Title;
+            }
+            if (icon != entry.icon) {
+                entry.icon = icon;
+                roles << Icon;
+            }
+            count = ++entry.visits;
+            if (now != entry.lastVisit) {
+                entry.lastVisit = now;
+                roles << LastVisit;
+            }
+        } else {
+            beginMoveRows(QModelIndex(), index, index, QModelIndex(), 0);
+            HistoryEntry entry = m_entries.takeAt(index);
+            if (title != entry.title) {
+                entry.title = title;
+                roles << Title;
+            }
+            if (icon != entry.icon) {
+                entry.icon = icon;
+                roles << Icon;
+            }
+            count = ++entry.visits;
+            if (now != entry.lastVisit) {
+                if (now.date() != entry.lastVisit.date()) {
+                    roles << LastVisitDate;
+                }
+                entry.lastVisit = now;
+                roles << LastVisit;
+            }
+            m_entries.prepend(entry);
+            endMoveRows();
+        }
+        Q_EMIT dataChanged(this->index(0, 0), this->index(0, 0), roles);
+        updateExistingEntryInDatabase(m_entries.first());
+    }
+    return count;
+}
+
+/*!
+    Remove a given URL from the history model.
+
+    If the URL was not previously visited, do nothing.
+*/
+void HomescreenWebappModel::removeEntryByUrl(const QUrl& url)
+{
+    if (url.isEmpty()) {
+        return;
+    }
+
+    removeByIndex(getEntryIndex(url));
+    removeEntryFromDatabaseByUrl(url);
+}
+
+/*!
+    Remove all urls from a given DOMAIN from the history model.
+*/
+void HomescreenWebappModel::removeEntriesByDomain(const QString& domain)
+{
+    if (domain.isEmpty()) {
+        return;
+    }
+
+    for (int i = m_entries.count() - 1; i >= 0; --i) {
+        if (m_entries.at(i).domain == domain) {
+            removeByIndex(i);
+        }
+    }
+    removeEntriesFromDatabaseByDomain(domain);
+}
+
+void HomescreenWebappModel::removeByIndex(int index)
+{
+    if (index >= 0) {
+        beginRemoveRows(QModelIndex(), index, index);
+        m_entries.removeAt(index);
+        endRemoveRows();
+    }
+}
+
+void HomescreenWebappModel::insertNewEntryInDatabase(const HistoryEntry& entry)
+{
+    QSqlQuery query(m_database);
+    static QString insertStatement = QLatin1String("INSERT INTO history (url, domain, title, icon, "
+                                                   "visits, lastVisit) VALUES (?, ?, ?, ?, 1, ?);");
+    query.prepare(insertStatement);
+    query.addBindValue(entry.url.toString());
+    query.addBindValue(entry.domain);
+    query.addBindValue(entry.title);
+    query.addBindValue(entry.icon.toString());
+    query.addBindValue(entry.lastVisit.toTime_t());
+    query.exec();
+}
+
+void HomescreenWebappModel::updateExistingEntryInDatabase(const HistoryEntry& entry)
+{
+    QSqlQuery query(m_database);
+    static QString updateStatement = QLatin1String("UPDATE history SET domain=?, title=?, icon=?, "
+                                                   "visits=?, lastVisit=? WHERE url=?;");
+    query.prepare(updateStatement);
+    query.addBindValue(entry.domain);
+    query.addBindValue(entry.title);
+    query.addBindValue(entry.icon.toString());
+    query.addBindValue(entry.visits);
+    query.addBindValue(entry.lastVisit.toTime_t());
+    query.addBindValue(entry.url.toString());
+    query.exec();
+}
+
+void HomescreenWebappModel::removeEntryFromDatabaseByUrl(const QUrl& url)
+{
+    QSqlQuery query(m_database);
+    static QString deleteStatement = QLatin1String("DELETE FROM history WHERE url=?;");
+    query.prepare(deleteStatement);
+    query.addBindValue(url.toString());
+    query.exec();
+}
+
+void HomescreenWebappModel::removeEntriesFromDatabaseByDomain(const QString& domain)
+{
+    QSqlQuery query(m_database);
+    static QString deleteStatement = QLatin1String("DELETE FROM history WHERE domain=?;");
+    query.prepare(deleteStatement);
+    query.addBindValue(domain);
+    query.exec();
+}
+
+void HomescreenWebappModel::clearAll()
+{
+    if (!m_entries.isEmpty()) {
+        beginResetModel();
+        m_entries.clear();
+        endResetModel();
+        clearDatabase();
+    }
+}
+
+void HomescreenWebappModel::clearDatabase()
+{
+    QSqlQuery query(m_database);
+    QString deleteStatement = QLatin1String("DELETE FROM history;");
+    query.prepare(deleteStatement);
+    query.exec();
+}

=== added file 'src/app/webbrowser/homescreen-webapp-model.h'
--- src/app/webbrowser/homescreen-webapp-model.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-webapp-model.h	2016-06-16 15:34:13 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef __HOMESCREEN_WEBAPP_MODEL_H__
+#define __HOMESCREEN_WEBAPP_MODEL_H__
+
+#include <QtCore/QAbstractListModel>
+#include <QtSql/QSqlDatabase>
+
+
+class HomescreenWebappModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString dbPath READ dbPath WRITE setDbPath NOTIFY dbPathChanged)
+
+public:
+    explicit HomescreenWebappModel(QObject *parent = 0);
+    ~HomescreenWebappModel();
+
+    // QAbstractListModel
+    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex& parent=QModelIndex()) const;
+    QVariant data(const QModelIndex& index, int role) const;
+
+    QString dbPath() const;
+    void setDbPath(const QString& path);
+
+    Q_INVOKABLE bool contains(const QUrl& url);
+    Q_INVOKABLE void add(const QUrl& url);
+
+Q_SIGNALS:
+    void dbPathChanged() const;
+
+private:
+    QSqlDatabase m_database;
+    QString m_dbPath;
+};
+
+#endif // __HOMESCREEN_WEBAPP_MODEL_H__

=== added file 'src/app/webbrowser/homescreen-webapp.cpp'
--- src/app/webbrowser/homescreen-webapp.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-webapp.cpp	2016-06-16 15:34:13 +0000
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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 "homescreen-webapp.h"
+
+#include <QtConcurrent/QtConcurrent>
+#include <QProcess>
+
+#include "homescreen-manifest-content.h"
+
+
+class HomescreenWebappPrivate : public QObject
+{
+    Q_OBJECT
+
+public:
+    HomescreenWebappPrivate(QObject *parent = 0);
+
+    void install(int requestId,
+                 const QString& short_name,
+                 const QString& name,
+                 const QUrl& homepage,
+                 const QStringList& icon_uris);
+
+Q_SIGNALS:
+    void installed(int requestId, bool status, const QString& errorMEssage);
+
+private Q_SLOTS:
+    void requestFinished();
+
+private:
+    friend class HomescreenWebapp;
+
+    int doInstall(int requestId,
+                 const QString& short_name,
+                 const QString& name,
+                 const QUrl& homepage,
+                 const QStringList& icon_uris);
+
+    QString _manifestFilename;
+    QUrl _baseUrl;
+    QUrl _referrer;
+    QString _userAgent;
+    QHash<int, QFutureWatcher<int>* > _requests;
+};
+
+
+HomescreenWebappPrivate::HomescreenWebappPrivate(
+        QObject *parent)
+    : QObject(parent)
+{}
+
+int HomescreenWebappPrivate::doInstall(
+        int requestId,
+        const QString& short_name,
+        const QString& ,
+        const QUrl& homepage,
+        const QStringList& )
+{
+    QProcess installerProcess;
+    qDebug() << "/usr/bin/homescreen-webapp-installer";
+    installerProcess.start(
+        "/usr/bin/homescreen-webapp-installer.py",
+        QStringList()
+            << QString("--name=%1").arg(short_name)
+            << QString("--homepage=%1").arg(homepage.toString())
+            << QString("--domain=%1").arg(homepage.host()));
+
+    installerProcess.waitForFinished();
+
+    return requestId;
+    // installerProcess.error()
+}
+
+void HomescreenWebappPrivate::install(int requestId,
+                                      const QString& short_name,
+                                      const QString& name,
+                                      const QUrl& homepage,
+                                      const QStringList& icon_uris)
+{
+    // https://developer.mozilla.org/en-US/Apps/Build/Manifest
+    // Internal paths also must be served from the same origin as the app
+
+    QFuture<int> future =
+        QtConcurrent::run(
+            this,
+            &HomescreenWebappPrivate::doInstall,
+            requestId, short_name, name, homepage, icon_uris);
+
+    QFutureWatcher<int>* watcher = new QFutureWatcher<int>();
+    connect(watcher,
+            SIGNAL(finished()),
+            this,
+            SLOT(requestFinished()));
+
+    _requests.insert(requestId, watcher);
+
+    watcher->setFuture(future);
+
+    future.begin();
+}
+
+void HomescreenWebappPrivate::requestFinished()
+{
+    QFutureWatcher<int> * watcher =
+            static_cast< QFutureWatcher<int>* >(sender());
+    if (watcher) {
+        QFuture<int> future = watcher->future();
+        Q_EMIT installed(future.result(), true, "");
+    }
+    // TODO no id?
+}
+
+
+HomescreenWebapp::HomescreenWebapp(
+        QObject *parent) :
+    QObject(parent),
+    d_ptr(new HomescreenWebappPrivate())
+{}
+
+HomescreenWebapp::~HomescreenWebapp()
+{
+    delete d_ptr;
+}
+
+QString HomescreenWebapp::manifestFilename() const
+{
+    Q_D(const HomescreenWebapp);
+
+    return d->_manifestFilename;
+}
+
+void HomescreenWebapp::setManifestFilename(
+        const QString& manifest)
+{
+    Q_D(HomescreenWebapp);
+
+    if (d->_manifestFilename == manifest)
+    {
+        return;
+    }
+    d->_manifestFilename = manifest;
+    Q_EMIT manifestFilenameChanged();
+}
+
+QUrl HomescreenWebapp::baseUrl() const
+{
+    Q_D(const HomescreenWebapp);
+    return d->_baseUrl;
+}
+
+void HomescreenWebapp::setBaseUrl(
+        const QUrl& url)
+{
+    Q_D(HomescreenWebapp);
+
+    if (d->_baseUrl == url)
+    {
+        return;
+    }
+    d->_baseUrl = url;
+    Q_EMIT baseUrlChanged();
+}
+
+QUrl HomescreenWebapp::referrer() const
+{
+    Q_D(const HomescreenWebapp);
+    return d->_referrer;
+}
+
+void HomescreenWebapp::setReferrer(const QUrl& referrer)
+{
+    Q_D(HomescreenWebapp);
+    if (d->_referrer == referrer)
+    {
+        return;
+    }
+    d->_referrer = referrer;
+}
+
+QString HomescreenWebapp::userAgent() const
+{
+    Q_D(const HomescreenWebapp);
+    return d->_userAgent;
+}
+
+void HomescreenWebapp::setUserAgent(const QString& userAgent)
+{
+    Q_D(HomescreenWebapp);
+    if (d->_userAgent == userAgent)
+    {
+        return;
+    }
+    d->_userAgent = userAgent;
+}
+
+void HomescreenWebapp::install(
+        int requestId,
+        const QString& short_name,
+        const QString& name,
+        const QUrl& homepage,
+        const QStringList& icon_uris)
+{
+    Q_D(HomescreenWebapp);
+
+    QObject::connect(
+        d, SIGNAL(installed(int,bool,QString)),
+        this, SLOT(installCompleted(int,bool,const QString&)));
+
+    return d->install(requestId, short_name, name, homepage, icon_uris);
+}
+
+void HomescreenWebapp::installCompleted(
+        int id,
+        bool status,
+        const QString& errorMessage)
+{
+    Q_EMIT installed(id, status, errorMessage);
+}
+
+#include "homescreen-webapp.moc"

=== added file 'src/app/webbrowser/homescreen-webapp.h'
--- src/app/webbrowser/homescreen-webapp.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/homescreen-webapp.h	2016-06-16 15:34:13 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+#ifndef _HOMESCREEN_WEBAPP_H_
+#define _HOMESCREEN_WEBAPP_H_
+
+#include <QObject>
+#include <QUrl>
+#include <QString>
+#include <QScopedPointer>
+
+
+class HomescreenWebappPrivate;
+
+class HomescreenWebapp : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString manifestFilename READ manifestFilename WRITE setManifestFilename NOTIFY manifestFilenameChanged)
+    Q_PROPERTY(QUrl baseUrl READ baseUrl WRITE setBaseUrl NOTIFY baseUrlChanged)
+    Q_PROPERTY(QUrl referrer READ referrer WRITE setReferrer NOTIFY referrerChanged)
+    Q_PROPERTY(QString userAgent READ userAgent WRITE setUserAgent NOTIFY userAgentChanged)
+
+public:
+    explicit HomescreenWebapp(QObject *parent = 0);
+    ~HomescreenWebapp();
+
+    QString manifestFilename() const;
+    void setManifestFilename(const QString& manifest);
+
+    QUrl baseUrl() const;
+    void setBaseUrl(const QUrl& url);
+
+    QUrl referrer() const;
+    void setReferrer(const QUrl& referrer);
+
+    QString userAgent() const;
+    void setUserAgent(const QString& userAgent);
+
+    Q_INVOKABLE void install(
+        int requestId,
+        const QString& short_name,
+        const QString& name,
+        const QUrl& homepage,
+        const QStringList& icon_uris);
+
+
+Q_SIGNALS:
+    void installed(
+        int id,
+        bool status,
+        const QString& errorMessage);
+
+    void manifestFilenameChanged();
+    void baseUrlChanged();
+    void referrerChanged();
+    void userAgentChanged();
+
+
+private Q_SLOTS:
+    void installCompleted(
+            int id,
+            bool status,
+            const QString& errorMessage);
+
+
+private:
+    HomescreenWebappPrivate* d_ptr;
+    Q_DECLARE_PRIVATE(HomescreenWebapp)
+};
+
+#endif // _HOMESCREEN_WEBAPP_H_

=== added file 'src/app/webbrowser/page-metadata-gathering.js'
--- src/app/webbrowser/page-metadata-gathering.js	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/page-metadata-gathering.js	2016-06-16 15:34:13 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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; version 3.
+ *
+ * webbrowser-app 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/>.
+ */
+
+// Runs at document-end by default
+(function() {
+    function detectWebappManifest() {
+        var webapp_capable_meta =
+                document.head.querySelector('meta[name="mobile-web-app-capable"]');
+        var manifest = document.head.querySelector('link[rel="manifest"]');
+        var theme_color_meta = document.head.querySelector('meta[name="theme-color"]');
+
+        if (webapp_capable_meta &&
+                manifest &&
+                webapp_capable_meta.getAttribute('content') === 'yes' &&
+                manifest.getAttribute('href')) {
+
+            oxide.sendMessage(
+                'webapp-capable-website-detected', {
+                    type: 'manifest',
+                    manifest: manifest.href,
+                    baseurl: document.location.href,
+                    theme_color: theme_color_meta.getAttribute('content')
+                });
+            return true;
+        }
+        return false;
+    }
+
+    function detectAppleMetaWebappInfo() {
+        var webapp_capable_meta =
+                document.head.querySelector('meta[name="apple-mobile-web-app-capable"]');
+        var webapp_title_meta =
+                document.head.querySelector('meta[name="apple-mobile-web-app-title"]');
+        var webapp_color_meta =
+                document.head.querySelector('meta[name="apple-mobile-web-app-status-bar-style"]');
+
+        function getAppleIcons() {
+            // by order of pref
+            var apple_icon = document.head.querySelector('link[rel="apple-touch-icon"]');
+            var apple_icon_pre = document.head.querySelector('link[rel="apple-touch-icon-precomposed"]');
+            var fallback_icon = document.head.querySelector('link[rel="icon"]');
+
+            if (apple_icon &&
+                    apple_icon.getAttribute('href')) {
+                return [apple_icon.getAttribute('href')]
+            }
+            if (apple_icon_pre &&
+                    apple_icon_pre.getAttribute('href')) {
+                return [apple_icon_pre.getAttribute('href')]
+            }
+
+            // TODO watch out for multiple defs (sizes)
+            if (fallback_icon &&
+                    fallback_icon.getAttribute('href')) {
+                return [fallback_icon.getAttribute('href')]
+            }
+        }
+
+        if (webapp_capable_meta &&
+                webapp_title_meta &&
+                webapp_capable_meta.getAttribute('content') === 'yes' &&
+                webapp_title_meta.getAttribute('content')) {
+            oxide.sendMessage(
+                'webapp-capable-website-detected', {
+                    type: 'apple',
+                    manifest: document.head.innerHTML,
+                    baseurl: document.location.href,
+                    title: webapp_title_meta.getAttribute('content'),
+                    icons: getAppleIcons(),
+                    theme_color: webapp_color_meta
+                                 ? webapp_color_meta.getAttribute('content')
+                                 : ''
+            });
+            return true;
+        }
+        return false;
+    };
+
+    var detectors = [detectAppleMetaWebappInfo, detectWebappManifest]
+    for (var i in detectors) {
+        if (detectors[i]()) {
+            console.log('Webapp capable website detected by ' + detectors[i].name)
+            break;
+        }
+    }
+})();

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2016-05-09 22:51:50 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2016-06-16 15:34:13 +0000
@@ -25,6 +25,8 @@
 #include "history-domainlist-model.h"
 #include "history-lastvisitdatelist-model.h"
 #include "history-model.h"
+#include "homescreen-webapp.h"
+#include "homescreen-installed-webapp-model.h"
 #include "limit-proxy-model.h"
 #include "searchengine.h"
 #include "text-search-filter-model.h"
@@ -70,6 +72,8 @@
     qmlRegisterType<TabsModel>(uri, 0, 1, "TabsModel");
     qmlRegisterSingletonType<BookmarksModel>(uri, 0, 1, "BookmarksModel", BookmarksModel_singleton_factory);
     qmlRegisterType<BookmarksFolderListModel>(uri, 0, 1, "BookmarksFolderListModel");
+    qmlRegisterType<HomescreenWebapp>(uri, 0, 1, "HomescreenWebapp");
+    qmlRegisterType<HomescreenInstalledWebappModel>(uri, 0, 1, "HomescreenInstalledWebappModel");
     qmlRegisterSingletonType<FileOperations>(uri, 0, 1, "FileOperations", FileOperations_singleton_factory);
     qmlRegisterType<SearchEngine>(uri, 0, 1, "SearchEngine");
     qmlRegisterSingletonType<CacheDeleter>(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory);

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-04-29 20:19:23 +0000
+++ src/app/webcontainer/WebApp.qml	2016-06-16 15:34:13 +0000
@@ -127,6 +127,29 @@
         return result
     }
 
+    Component {
+         id: webappCapableInstallComponent
+         Rectangle {
+             id: dialogue
+             title: "Install"
+             text: "Are you sure that you want to save this file?"
+             Button {
+                 text: "cancel"
+                 onClicked: PopupUtils.close(dialogue)
+             }
+             Button {
+                 text: "overwrite previous version"
+                 color: UbuntuColors.orange
+                 onClicked: PopupUtils.close(dialogue)
+             }
+             Button {
+                 text: "save a copy"
+                 color: UbuntuColors.orange
+                 onClicked: PopupUtils.close(dialogue)
+             }
+         }
+    }
+
     Item {
         id: webviewContainer
         anchors.fill: parent
@@ -144,6 +167,10 @@
             height: parent.height - osk.height
             developerExtrasEnabled: webapp.developerExtrasEnabled
 
+            webappManifestDetected: {
+                PopupUtils.open(dialog)
+            }
+
             onThemeColorMetaInformationDetected: {
                 var color = webappContainerHelper.rgbColorFromCSSColor(theme_color)
                 if (!webapp.chromeless && chromeLoader.item && color.length) {
@@ -158,6 +185,7 @@
             onSamlRequestUrlPatternReceived: {
                 addGeneratedUrlPattern(urlPattern)
             }
+
             webappUrlPatterns: mergeUrlPatternSets(urlPatternSettings.generatedUrlPatterns,
                                    webapp.webappUrlPatterns)
 

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2016-04-22 13:52:07 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2016-06-16 15:34:13 +0000
@@ -87,6 +87,9 @@
         }
     }
 
+    // Just being trampolined to higher up from the oxide webview
+    signal webappManifestDetected(var metainfos)
+
     Connections {
         target: webappContainerWebViewLoader.item
         onThemeColorMetaInformationDetected: {
@@ -98,6 +101,13 @@
         id: webappContainerWebViewLoader
         objectName: "containerWebviewLoader"
         anchors.fill: parent
+        onLoaded: {
+            if (item && item.webappManifestDetected) {
+                item.webappManifestDetected.connect(function(metainfos) {
+                    webappManifestDetected(metainfos)
+                });
+            }
+        }
     }
 
     onUrlChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.url = url