Merge lp:~abreu-alexandre/webbrowser-app/webapp-download into lp:webbrowser-app

[Alexandre Abreu]

WIP

[lp:~abreu-alexandre/webbrowser-app/webapp-download]

1467. By Alexandre Abreu on 2016-09-01

updates

1468. By Alexandre Abreu on 2016-09-01

merge trunk

Unmerged revisions

1468. By Alexandre Abreu on 2016-09-01

merge trunk

1467. By Alexandre Abreu on 2016-09-01

updates

1466. By Alexandre Abreu on 2016-05-27

draft

=== modified file 'po/webbrowser-app.pot'
--- po/webbrowser-app.pot	2016-08-27 13:14:03 +0000
+++ po/webbrowser-app.pot	2016-09-01 14:43:39 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: webbrowser-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-27 15:13+0200\n"
+"POT-Creation-Date: 2016-06-23 13:47-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"
@@ -47,16 +47,16 @@
 msgid "Password"
 msgstr ""
 
-#: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:32
-#: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38
-#: src/app/webbrowser/BookmarkOptions.qml:143
+#: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:31
+#: src/app/DownloadDelegate.qml:186 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/webbrowser/LeavePrivateModeDialog.qml:32
-#: src/app/webbrowser/SettingsPage.qml:258
-#: src/app/webbrowser/SettingsPage.qml:312
+#: src/app/webbrowser/SettingsPage.qml:259
+#: src/app/webbrowser/SettingsPage.qml:313
 #: src/app/webcontainer/AccountChooserDialog.qml:96
+#: src/app/webcontainer/ContentDownloadDialog.qml:114
 #: src/app/webcontainer/ContextMenuMobile.qml:141
 msgid "Cancel"
 msgstr ""
@@ -69,7 +69,7 @@
 msgid "Leave"
 msgstr ""
 
-#: src/app/BeforeUnloadDialog.qml:32
+#: src/app/BeforeUnloadDialog.qml:31
 msgid "Stay"
 msgstr ""
 
@@ -86,12 +86,12 @@
 msgstr ""
 
 #: src/app/CertificateVerificationDialog.qml:29
-#: src/app/InvalidCertificateErrorSheet.qml:161
+#: src/app/InvalidCertificateErrorSheet.qml:160
 msgid "Proceed anyway"
 msgstr ""
 
 #: src/app/CertificateVerificationDialog.qml:35
-#: src/app/InvalidCertificateErrorSheet.qml:174
+#: src/app/InvalidCertificateErrorSheet.qml:173
 msgid "Back to safety"
 msgstr ""
 
@@ -99,6 +99,35 @@
 msgid "JavaScript Confirmation"
 msgstr ""
 
+#: src/app/DownloadDelegate.qml:158
+msgid "Download failed"
+msgstr ""
+
+#: src/app/DownloadDelegate.qml:207
+msgid "Resume"
+msgstr ""
+
+#: src/app/DownloadsPage.qml:44 src/app/webbrowser/Browser.qml:575
+#: src/app/webcontainer/WebApp.qml:315
+msgid "Downloads"
+msgstr ""
+
+#: src/app/DownloadsPage.qml:58
+msgid "Confirm selection"
+msgstr ""
+
+#: src/app/DownloadsPage.qml:82 src/app/actions/SelectAll.qml:22
+msgid "Select all"
+msgstr ""
+
+#: src/app/DownloadsPage.qml:98
+msgid "Delete"
+msgstr ""
+
+#: src/app/DownloadsPage.qml:258
+msgid "No downloads available"
+msgstr ""
+
 #: src/app/ErrorSheet.qml:36
 msgid "Network Error"
 msgstr ""
@@ -129,26 +158,20 @@
 msgid "Deny"
 msgstr ""
 
-#: src/app/GeolocationPermissionRequest.qml:42
+#: src/app/GeolocationPermissionRequest.qml:43
 msgid "Allow"
 msgstr ""
 
-#. TRANSLATORS: %1 refers to the URL of the current website and %2 is a string that the website sends with more information about the authentication challenge (technically called "realm")
-#: src/app/HttpAuthenticationDialog.qml:27
-#, qt-format
-msgid "The website at %1 requires authentication. The website says \"%2\""
-msgstr ""
-
-#: src/app/InvalidCertificateErrorSheet.qml:56
+#: src/app/InvalidCertificateErrorSheet.qml:55
 msgid "This site security certificate is not trusted.\n"
 msgstr ""
 
-#: src/app/InvalidCertificateErrorSheet.qml:64
+#: src/app/InvalidCertificateErrorSheet.qml:63
 msgid "Learn more"
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's serial number
-#: src/app/InvalidCertificateErrorSheet.qml:88
+#: src/app/InvalidCertificateErrorSheet.qml:87
 #, qt-format
 msgid ""
 "Serial number:\n"
@@ -156,7 +179,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's subject display name
-#: src/app/InvalidCertificateErrorSheet.qml:95
+#: src/app/InvalidCertificateErrorSheet.qml:94
 #, qt-format
 msgid ""
 "Subject:\n"
@@ -164,7 +187,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's subject's address
-#: src/app/InvalidCertificateErrorSheet.qml:103
+#: src/app/InvalidCertificateErrorSheet.qml:102
 #, qt-format
 msgid ""
 "Subject address:\n"
@@ -172,7 +195,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's issuer display name
-#: src/app/InvalidCertificateErrorSheet.qml:114
+#: src/app/InvalidCertificateErrorSheet.qml:113
 #, qt-format
 msgid ""
 "Issuer:\n"
@@ -180,7 +203,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's issuer's address
-#: src/app/InvalidCertificateErrorSheet.qml:122
+#: src/app/InvalidCertificateErrorSheet.qml:121
 #, qt-format
 msgid ""
 "Issuer address:\n"
@@ -188,7 +211,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's start date
-#: src/app/InvalidCertificateErrorSheet.qml:133
+#: src/app/InvalidCertificateErrorSheet.qml:132
 #, qt-format
 msgid ""
 "Valid from:\n"
@@ -196,7 +219,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's expiry date
-#: src/app/InvalidCertificateErrorSheet.qml:140
+#: src/app/InvalidCertificateErrorSheet.qml:139
 #, qt-format
 msgid ""
 "Valid until:\n"
@@ -204,21 +227,21 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the SSL certificate's SHA1 fingerprint
-#: src/app/InvalidCertificateErrorSheet.qml:147
+#: src/app/InvalidCertificateErrorSheet.qml:146
 #, qt-format
 msgid ""
 "Fingerprint (SHA1):\n"
 "%1"
 msgstr ""
 
-#: src/app/InvalidCertificateErrorSheet.qml:154
+#: src/app/InvalidCertificateErrorSheet.qml:153
 msgid ""
 "You should not proceed, especially if you have never seen this warning "
 "before for this site."
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:188
+#: src/app/InvalidCertificateErrorSheet.qml:187
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented a security certificate "
@@ -226,7 +249,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:191
+#: src/app/InvalidCertificateErrorSheet.qml:190
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented a security certificate "
@@ -234,7 +257,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:194
+#: src/app/InvalidCertificateErrorSheet.qml:193
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented a security certificate "
@@ -242,7 +265,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:197
+#: src/app/InvalidCertificateErrorSheet.qml:196
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented a security certificate "
@@ -250,7 +273,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:200
+#: src/app/InvalidCertificateErrorSheet.qml:199
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented a security certificate "
@@ -258,7 +281,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:203
+#: src/app/InvalidCertificateErrorSheet.qml:202
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented an invalid security "
@@ -266,7 +289,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:206
+#: src/app/InvalidCertificateErrorSheet.qml:205
 #, qt-format
 msgid ""
 "You attempted to reach %1 but the server presented an insecure security "
@@ -274,7 +297,7 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the domain name of the SSL certificate
-#: src/app/InvalidCertificateErrorSheet.qml:209
+#: src/app/InvalidCertificateErrorSheet.qml:208
 #, qt-format
 msgid ""
 "This site security certificate is not trusted\n"
@@ -380,7 +403,7 @@
 msgid "Erase"
 msgstr ""
 
-#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:578
+#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:568
 msgid "Find in page"
 msgstr ""
 
@@ -410,7 +433,7 @@
 msgid "Address;URL;www"
 msgstr ""
 
-#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:461
+#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:451
 #: src/app/webbrowser/TabsBar.qml:91
 msgid "New Tab"
 msgstr ""
@@ -472,11 +495,7 @@
 msgid "Save video"
 msgstr ""
 
-#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:83
-msgid "Select all"
-msgstr ""
-
-#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:558
+#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:548
 msgid "Share"
 msgstr ""
 
@@ -485,16 +504,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:212
+#: src/app/webbrowser/AddressBar.qml:208
 #, qt-format
 msgid "%1/%2"
 msgstr ""
 
-#: src/app/webbrowser/AddressBar.qml:248
+#: src/app/webbrowser/AddressBar.qml:244
 msgid "find in page"
 msgstr ""
 
-#: src/app/webbrowser/AddressBar.qml:249
+#: src/app/webbrowser/AddressBar.qml:245
 msgid "search or enter an address"
 msgstr ""
 
@@ -528,115 +547,94 @@
 msgstr ""
 
 #: src/app/webbrowser/BookmarkOptions.qml:153
-#: src/app/webbrowser/SettingsPage.qml:322
+#: src/app/webbrowser/SettingsPage.qml:323
 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
+#: src/app/webbrowser/NewTabView.qml:253 src/app/webbrowser/SettingsPage.qml:86
+#: src/app/webbrowser/SettingsPage.qml:287
 msgid "Homepage"
 msgstr ""
 
-#: src/app/webbrowser/BookmarksView.qml:32
-#: src/app/webbrowser/BookmarksViewWide.qml:32
-#: src/app/webbrowser/Browser.qml:566 src/app/webbrowser/NewTabView.qml:130
+#: src/app/webbrowser/BookmarksView.qml:33
+#: src/app/webbrowser/BookmarksViewWide.qml:33
+#: 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:76
-#: src/app/webbrowser/BookmarksViewWide.qml:75
-#: src/app/webbrowser/Browser.qml:447 src/app/webbrowser/HistoryView.qml:126
-#: src/app/webbrowser/HistoryViewWide.qml:407
+#: src/app/webbrowser/BookmarksView.qml:71
+#: src/app/webbrowser/BookmarksViewWide.qml:70
+#: src/app/webbrowser/Browser.qml:437 src/app/webbrowser/HistoryView.qml:129
+#: src/app/webbrowser/HistoryViewWide.qml:419
 msgid "Done"
 msgstr ""
 
-#: src/app/webbrowser/BookmarksView.qml:90
-#: src/app/webbrowser/BookmarksViewWide.qml:89
-#: src/app/webbrowser/HistoryView.qml:140
-#: src/app/webbrowser/HistoryViewWide.qml:421
+#: src/app/webbrowser/BookmarksView.qml:85
+#: src/app/webbrowser/BookmarksViewWide.qml:84
+#: src/app/webbrowser/HistoryView.qml:143
+#: src/app/webbrowser/HistoryViewWide.qml:433
 #: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99
 msgid "New tab"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:572 src/app/webbrowser/HistoryView.qml:30
-#: src/app/webbrowser/HistoryViewWide.qml:35
+#: src/app/webbrowser/Browser.qml:562 src/app/webbrowser/HistoryView.qml:31
+#: src/app/webbrowser/HistoryViewWide.qml:36
 msgid "History"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:585 src/app/webbrowser/DownloadsPage.qml:45
-msgid "Downloads"
-msgstr ""
-
-#: src/app/webbrowser/Browser.qml:592
+#: src/app/webbrowser/Browser.qml:582
 msgid "Leave Private Mode"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:592
+#: src/app/webbrowser/Browser.qml:582
 msgid "Private Mode"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:610 src/app/webbrowser/SettingsPage.qml:41
+#: src/app/webbrowser/Browser.qml:600 src/app/webbrowser/SettingsPage.qml:42
 msgid "Settings"
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the current number of tabs opened
-#: src/app/webbrowser/Browser.qml:783 src/app/webbrowser/Browser.qml:821
+#: src/app/webbrowser/Browser.qml:772 src/app/webbrowser/Browser.qml:810
 #, qt-format
 msgid "(%1)"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:1377
+#: src/app/webbrowser/Browser.qml:1366
 msgid "Swipe Up To Exit Full Screen"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:1378
+#: src/app/webbrowser/Browser.qml:1367
 msgid "Press ESC To Exit Full Screen"
 msgstr ""
 
 #: src/app/webbrowser/ContentDownloadDialog.qml:83
+#: src/app/webcontainer/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
+#: src/app/webcontainer/ContentDownloadDialog.qml:89
 msgid "Choose an application"
 msgstr ""
 
 #: src/app/webbrowser/ContentDownloadDialog.qml:102
+#: src/app/webcontainer/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:252
-msgid "No downloads available"
-msgstr ""
-
-#: src/app/webbrowser/ExpandedHistoryView.qml:117
+#: src/app/webbrowser/ExpandedHistoryView.qml:119
 #, qt-format
 msgid "%1 page"
 msgid_plural "%1 pages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/app/webbrowser/ExpandedHistoryView.qml:132
+#: src/app/webbrowser/ExpandedHistoryView.qml:134
 #: src/app/webbrowser/NewTabView.qml:143
 msgid "Less"
 msgstr ""
@@ -646,20 +644,20 @@
 msgstr ""
 
 #: src/app/webbrowser/HistorySectionDelegate.qml:48
-#: src/app/webbrowser/HistoryViewWide.qml:251
+#: src/app/webbrowser/HistoryViewWide.qml:252
 msgid "Yesterday"
 msgstr ""
 
-#: src/app/webbrowser/HistoryViewWide.qml:160
+#: src/app/webbrowser/HistoryViewWide.qml:161
 msgid "search history"
 msgstr ""
 
-#: src/app/webbrowser/HistoryViewWide.qml:235
+#: src/app/webbrowser/HistoryViewWide.qml:236
 msgid "All History"
 msgstr ""
 
-#: src/app/webbrowser/HistoryViewWide.qml:249
-#: src/app/webbrowser/HistoryViewWide.qml:336
+#: src/app/webbrowser/HistoryViewWide.qml:250
+#: src/app/webbrowser/HistoryViewWide.qml:348
 msgid "Today"
 msgstr ""
 
@@ -681,12 +679,12 @@
 msgid "More"
 msgstr ""
 
-#: src/app/webbrowser/NewTabView.qml:326
+#: src/app/webbrowser/NewTabView.qml:328
 #: src/app/webbrowser/NewTabViewWide.qml:138
 msgid "Top sites"
 msgstr ""
 
-#: src/app/webbrowser/NewTabView.qml:357
+#: src/app/webbrowser/NewTabView.qml:359
 msgid "You haven't visited any site yet"
 msgstr ""
 
@@ -766,54 +764,54 @@
 msgid "Default"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:70
-#: src/app/webbrowser/SettingsPage.qml:150
+#: src/app/webbrowser/SettingsPage.qml:71
+#: src/app/webbrowser/SettingsPage.qml:151
 msgid "Search engine"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:96
+#: src/app/webbrowser/SettingsPage.qml:97
 msgid "Restore previous session at startup"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:115
-#: src/app/webbrowser/SettingsPage.qml:193
+#: src/app/webbrowser/SettingsPage.qml:116
+#: src/app/webbrowser/SettingsPage.qml:194
 msgid "Privacy & permissions"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:126
+#: src/app/webbrowser/SettingsPage.qml:127
 msgid "Reset browser settings"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:206
-#: src/app/webbrowser/SettingsPage.qml:342
+#: src/app/webbrowser/SettingsPage.qml:207
+#: src/app/webbrowser/SettingsPage.qml:343
 msgid "Camera & microphone"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:215
+#: src/app/webbrowser/SettingsPage.qml:216
 msgid "Clear Browsing History"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:219
+#: src/app/webbrowser/SettingsPage.qml:220
 msgid "Clear Browsing History?"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:227
+#: src/app/webbrowser/SettingsPage.qml:228
 msgid "Clear Cache"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:230
+#: src/app/webbrowser/SettingsPage.qml:231
 msgid "Clear Cache?"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:265
+#: src/app/webbrowser/SettingsPage.qml:266
 msgid "Clear"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:354
+#: src/app/webbrowser/SettingsPage.qml:355
 msgid "Microphone"
 msgstr ""
 
-#: src/app/webbrowser/SettingsPage.qml:375
+#: src/app/webbrowser/SettingsPage.qml:376
 msgid "Camera"
 msgstr ""
 
@@ -825,19 +823,19 @@
 msgid "Close Tab"
 msgstr ""
 
-#: src/app/webbrowser/UrlPreviewDelegate.qml:137
+#: 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:70
+#: src/app/webcontainer/webapp-container.qml:69
 #, qt-format
 msgid "%1 - Ubuntu Web Browser"
 msgstr ""
 
 #: src/app/webbrowser/webbrowser-app.qml:37
-#: src/app/webcontainer/webapp-container.qml:72
+#: src/app/webcontainer/webapp-container.qml:71
 msgid "Ubuntu Web Browser"
 msgstr ""
 
@@ -869,10 +867,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

=== renamed file 'src/app/webbrowser/BrowserPage.qml' => 'src/app/BrowserPage.qml'
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2016-04-12 19:59:00 +0000
+++ src/app/CMakeLists.txt	2016-09-01 14:43:39 +0000
@@ -21,6 +21,7 @@
 
 set(COMMONLIB_SRC
     browserapplication.cpp
+    downloads-model.cpp
     favicon-fetcher.cpp
     meminfo.cpp
     mime-database.cpp

=== renamed file 'src/app/webbrowser/DownloadDelegate.qml' => 'src/app/DownloadDelegate.qml'
--- src/app/webbrowser/DownloadDelegate.qml	2016-05-23 02:52:50 +0000
+++ src/app/DownloadDelegate.qml	2016-09-01 14:43:39 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import ".."
 
 ListItem {
     id: downloadDelegate

=== renamed file 'src/app/webbrowser/DownloadHandler.qml' => 'src/app/DownloadHandler.qml'
--- src/app/webbrowser/DownloadHandler.qml	2016-01-12 11:06:49 +0000
+++ src/app/DownloadHandler.qml	2016-09-01 14:43:39 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Ubuntu.DownloadManager 1.2
-import webbrowserapp.private 0.1
+import webbrowsercommon.private 0.2
 
 DownloadManager {
     onDownloadFinished: {

=== renamed file 'src/app/webbrowser/DownloadsPage.qml' => 'src/app/DownloadsPage.qml'
--- src/app/webbrowser/DownloadsPage.qml	2016-06-06 09:09:47 +0000
+++ src/app/DownloadsPage.qml	2016-09-01 14:43:39 +0000
@@ -19,10 +19,9 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Content 1.3
-import webbrowserapp.private 0.1
-import webbrowsercommon.private 0.1
+import webbrowsercommon.private 0.2
 
-import "../MimeTypeMapper.js" as MimeTypeMapper
+import "MimeTypeMapper.js" as MimeTypeMapper
 
 BrowserPage {
     id: downloadsItem

=== renamed file 'src/app/webbrowser/IndeterminateProgressBar.qml' => 'src/app/IndeterminateProgressBar.qml'
=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2016-06-16 13:30:01 +0000
+++ src/app/browserapplication.cpp	2016-09-01 14:43:39 +0000
@@ -35,6 +35,7 @@
 // local
 #include "browserapplication.h"
 #include "config.h"
+#include "downloads-model.h"
 #include "favicon-fetcher.h"
 #include "meminfo.h"
 #include "mime-database.h"
@@ -102,6 +103,7 @@
         return new type(); \
     }
 
+MAKE_SINGLETON_FACTORY(DownloadsModel)
 MAKE_SINGLETON_FACTORY(MemInfo)
 MAKE_SINGLETON_FACTORY(MimeDatabase)
 
@@ -185,6 +187,10 @@
     qmlRegisterSingletonType<MimeDatabase>(uri, 0, 1, "MimeDatabase", MimeDatabase_singleton_factory);
     qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
     qmlRegisterType<QQuickShortcut>(uri, 0, 1, "Shortcut");
+    qmlRegisterSingletonType<DownloadsModel>(
+                uri, 0, 2,
+                "DownloadsModel",
+                DownloadsModel_singleton_factory);
 
     const char* inputInfoUri = "Unity.InputInfo";
     qmlRegisterType<QDeclarativeInputDeviceModel>(inputInfoUri, 0, 1, "InputDeviceModel");

=== renamed file 'src/app/webbrowser/downloads-model.cpp' => 'src/app/downloads-model.cpp'
=== renamed file 'src/app/webbrowser/downloads-model.h' => 'src/app/downloads-model.h'
=== modified file 'src/app/single-instance-manager.cpp'
--- src/app/single-instance-manager.cpp	2016-07-29 14:29:07 +0000
+++ src/app/single-instance-manager.cpp	2016-09-01 14:43:39 +0000
@@ -123,6 +123,11 @@
                 SLOT(onNewInstanceConnected()));
         return true;
     }
+
+    if (m_server.serverError() == QAbstractSocket::HostNotFoundError) {
+
+    }
+
     return false;
 }
 

=== modified file 'src/app/webbrowser/BookmarksView.qml'
--- src/app/webbrowser/BookmarksView.qml	2016-05-23 08:56:38 +0000
+++ src/app/webbrowser/BookmarksView.qml	2016-09-01 14:43:39 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import webbrowserapp.private 0.1
 import "." as Local
+import ".."
 
 BrowserPage {
     id: bookmarksView

=== modified file 'src/app/webbrowser/BookmarksViewWide.qml'
--- src/app/webbrowser/BookmarksViewWide.qml	2016-05-23 08:56:38 +0000
+++ src/app/webbrowser/BookmarksViewWide.qml	2016-09-01 14:43:39 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import webbrowserapp.private 0.1
 import "." as Local
+import ".."
 
 BrowserPage {
     id: bookmarksViewWide

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-07-01 08:52:37 +0000
+++ src/app/webbrowser/Browser.qml	2016-09-01 14:43:39 +0000
@@ -25,7 +25,7 @@
 import Ubuntu.Components.Popups 1.3
 import Unity.InputInfo 0.1
 import webbrowserapp.private 0.1
-import webbrowsercommon.private 0.1
+import webbrowsercommon.private 0.2
 import "../actions" as Actions
 import "../UrlUtils.js" as UrlUtils
 import ".."
@@ -988,7 +988,7 @@
 
         anchors.fill: parent
         active: false
-        source: "DownloadsPage.qml"
+        source: "../DownloadsPage.qml"
 
         Binding {
             target: downloadsViewLoader.item
@@ -1041,7 +1041,7 @@
 
     Loader {
         id: downloadHandlerLoader
-        source: "DownloadHandler.qml"
+        source: "../DownloadHandler.qml"
         asynchronous: true
     }
 

=== 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-09-01 14:43:39 +0000
@@ -13,7 +13,6 @@
     bookmarks-model.cpp
     bookmarks-folder-model.cpp
     bookmarks-folderlist-model.cpp
-    downloads-model.cpp
     history-domain-model.cpp
     history-domainlist-model.cpp
     history-lastvisitdatelist-model.cpp

=== modified file 'src/app/webbrowser/HistoryView.qml'
--- src/app/webbrowser/HistoryView.qml	2016-06-06 09:09:47 +0000
+++ src/app/webbrowser/HistoryView.qml	2016-09-01 14:43:39 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import webbrowserapp.private 0.1
 import "." as Local
+import ".."
 
 BrowserPage {
     id: historyView

=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml	2016-08-25 09:51:33 +0000
+++ src/app/webbrowser/HistoryViewWide.qml	2016-09-01 14:43:39 +0000
@@ -21,6 +21,7 @@
 import webbrowserapp.private 0.1
 import "Highlight.js" as Highlight
 import "." as Local
+import ".."
 
 BrowserPage {
     id: historyViewWide

=== modified file 'src/app/webbrowser/SettingsPage.qml'
--- src/app/webbrowser/SettingsPage.qml	2016-08-25 09:51:33 +0000
+++ src/app/webbrowser/SettingsPage.qml	2016-09-01 14:43:39 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Web 0.2
 import webbrowserapp.private 0.1
 
+import ".."
 import "../UrlUtils.js" as UrlUtils
 
 FocusScope {

=== 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-09-01 14:43:39 +0000
@@ -20,7 +20,6 @@
 #include "bookmarks-folderlist-model.h"
 #include "cache-deleter.h"
 #include "config.h"
-#include "downloads-model.h"
 #include "file-operations.h"
 #include "history-domainlist-model.h"
 #include "history-lastvisitdatelist-model.h"
@@ -31,6 +30,8 @@
 #include "tabs-model.h"
 #include "webbrowser-app.h"
 
+#include "../downloads-model.h"
+
 // Qt
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>

=== modified file 'src/app/webcontainer/ContentDownloadDialog.qml'
--- src/app/webcontainer/ContentDownloadDialog.qml	2016-02-29 15:18:40 +0000
+++ src/app/webcontainer/ContentDownloadDialog.qml	2016-09-01 14:43:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -29,40 +29,130 @@
         objectName: "downloadDialog"
         anchors.fill: parent
         property var activeTransfer
-        property var downloadId
+        property string downloadId
         property var singleDownload
-        property var mimeType
-        property var filename
-        property var icon: MimeDatabase.iconForMimetype(mimeType)
+        property string mimeType
+        property string filename
+        property string icon: MimeDatabase.iconForMimetype(mimeType)
         property alias contentType: peerPicker.contentType
-    
+
+        signal startDownload(string downloadId, var download, string mimeType)
+
+        Component {
+            id: downloadOptionsComponent
+            Dialog {
+                id: downloadOptionsDialog
+                objectName: "downloadOptionsDialog"
+                Column {
+                    spacing: units.gu(2)
+
+                    Item {
+                        width: parent.width
+                        height: mimetypeIcon.height
+
+                        Icon {
+                            id: mimetypeIcon
+                            name: icon != "" ? icon : "save"
+                            height: units.gu(4.5)
+                            width: height
+                        }
+
+                        Label {
+                            id: filenameLabel
+                            anchors.top: mimetypeIcon.top
+                            anchors.left: mimetypeIcon.right
+                            anchors.leftMargin: units.gu(2)
+                            anchors.right: parent.right
+                            anchors.rightMargin: units.gu(2)
+                            elide: Text.ElideMiddle
+                            text: downloadDialog.filename
+                        }
+
+                        Label {
+                            anchors.top: filenameLabel.bottom
+                            anchors.left: filenameLabel.left
+                            anchors.right: filenameLabel.right
+                            elide: Text.ElideRight
+                            font.capitalization: Font.Capitalize
+                            text: MimeDatabase.nameForMimetype(downloadDialog.mimeType)
+                        }
+                    }
+
+                    Label {
+                        width: parent.width
+                        text: i18n.tr("Choose an application to open this file or add it to the downloads folder.")
+                        wrapMode: Text.Wrap
+                        visible: peerModel.peers.length > 0
+                    }
+
+                    Button {
+                        text: i18n.tr("Choose an application")
+                        objectName: "chooseAppButton"
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        width: units.gu(22)
+                        height: units.gu(4)
+                        visible: peerModel.peers.length > 0
+                        onClicked: {
+                            PopupUtils.close(downloadOptionsDialog)
+                            pickerRect.visible = true
+                        }
+                    }
+
+                    Button {
+                        text: i18n.tr("Download")
+                        objectName: "downloadFileButton"
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        width: units.gu(22)
+                        height: units.gu(4)
+                        onClicked: {
+                            startDownload(downloadId, singleDownload, mimeType)
+                            PopupUtils.close(downloadDialog)
+                        }
+                    }
+
+                    Button {
+                        text: i18n.tr("Cancel")
+                        objectName: "cancelDownloadButton"
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        width: units.gu(22)
+                        height: units.gu(4)
+                        onClicked: PopupUtils.close(downloadDialog)
+                    }
+                }
+            }
+        }
+
         ContentPeerModel {
             id: peerModel
             handler: ContentHandler.Destination
             contentType: downloadDialog.contentType
         }
-    
+
         Rectangle {
             id: pickerRect
             anchors.fill: parent
-            visible: true
+            visible: false
             ContentPeerPicker {
                 id: peerPicker
                 handler: ContentHandler.Destination
                 objectName: "contentPeerPicker"
                 visible: parent.visible
-    
+
                 onPeerSelected: {
                     activeTransfer = peer.request()
                     activeTransfer.downloadId = downloadDialog.downloadId
                     activeTransfer.state = ContentTransfer.Downloading
                     PopupUtils.close(downloadDialog)
                 }
-    
+
                 onCancelPressed: {
                     PopupUtils.close(downloadDialog)
                 }
             }
         }
+
+        Component.onCompleted: {
+            PopupUtils.open(downloadOptionsComponent, downloadDialog)
+        }
     }
 }

=== modified file 'src/app/webcontainer/PopupWindowController.qml'
--- src/app/webcontainer/PopupWindowController.qml	2016-03-24 14:06:22 +0000
+++ src/app/webcontainer/PopupWindowController.qml	2016-09-01 14:43:39 +0000
@@ -36,11 +36,26 @@
     signal openExternalUrlTriggered(string url)
     signal newViewCreated(string url)
     signal windowOverlayOpenAnimationDone()
+    signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType)
 
     signal initializeOverlayViewsWithUrls(var urls)
 
     readonly property int maxSimultaneousViews: 3
 
+    Component.onCompleted: {
+        if (webviewOverlayUrlsSettings.overlayUrls
+                && webviewOverlayUrlsSettings.overlayUrls.length > 0) {
+            try {
+                var urls = JSON.parse(webviewOverlayUrlsSettings.overlayUrls)
+                if (typeof(urls) === 'object'
+                        && urls.length != undefined
+                        && urls.length > 0) {
+                    initializeOverlayViewsWithUrls(urls)
+                }
+            } catch (e) {}
+        }
+    }
+
     Settings {
         id: webviewOverlayUrlsSettings
         property string overlayUrls
@@ -76,20 +91,6 @@
         }
     }
 
-    Component.onCompleted: {
-        if (webviewOverlayUrlsSettings.overlayUrls
-                && webviewOverlayUrlsSettings.overlayUrls.length > 0) {
-            try {
-                var urls = JSON.parse(webviewOverlayUrlsSettings.overlayUrls)
-                if (typeof(urls) === 'object'
-                        && urls.length != undefined
-                        && urls.length > 0) {
-                    initializeOverlayViewsWithUrls(urls)
-                }
-            } catch (e) {}
-        }
-    }
-
     function openUrlExternally(url) {
         if (!blockOpenExternalUrls) {
             Qt.openUrlExternally(url)
@@ -239,7 +240,11 @@
                     windowOverlayOpenAnimationDone()
                 }
             }
-	    
+
+            onShowDownloadDialog: controller.showDownloadDialog(
+                                      downloadId,contentType,
+                                      downloader, filename, mimeType)
+
             Behavior on y {
                 NumberAnimation {
                     duration: 500

=== modified file 'src/app/webcontainer/PopupWindowOverlay.qml'
--- src/app/webcontainer/PopupWindowOverlay.qml	2016-06-17 17:39:58 +0000
+++ src/app/webcontainer/PopupWindowOverlay.qml	2016-09-01 14:43:39 +0000
@@ -35,6 +35,9 @@
     property alias wide: popupWebview.wide
 
     signal webviewUrlChanged(url webviewUrl)
+    signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType)
+
+    focus: true
 
     focus: true
 
@@ -210,6 +213,10 @@
                     disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
         }
 
+        onShowDownloadDialog: popup.showDownloadDialog(
+                                  downloadId, contentType,
+                                  downloader, filename, mimeType)
+
         onNavigationRequested: {
             var url = request.url.toString()
             request.action = Oxide.NavigationRequest.ActionAccept

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-08-03 09:28:48 +0000
+++ src/app/webcontainer/WebApp.qml	2016-09-01 14:43:39 +0000
@@ -23,6 +23,10 @@
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import Ubuntu.UnityWebApps 0.1 as UnityWebApps
 import Qt.labs.settings 1.0
+import Ubuntu.Components.Popups 1.3
+import Unity.InputInfo 0.1
+import webbrowsercommon.private 0.2
+
 import "../actions" as Actions
 import ".."
 import "ColorUtils.js" as ColorUtils
@@ -56,6 +60,9 @@
     readonly property bool chromeless: !chromeVisible && !backForwardButtonsVisible && !accountSwitcher
     readonly property real themeColorTextContrastFactor: 3.0
 
+    readonly property bool hasMouse: (miceModel.count + touchPadModel.count) > 0
+    readonly property bool hasTouchScreen: touchScreenModel.count > 0
+
     signal chooseAccount()
 
     // Used for testing. There is a bug that currently prevents non visual Qt objects
@@ -63,6 +70,21 @@
     // not possible https://bugs.launchpad.net/autopilot-qt/+bug/1273956
     property alias generatedUrlPatterns: urlPatternSettings.generatedUrlPatterns
 
+    InputDeviceModel {
+        id: miceModel
+        deviceFilter: InputInfo.Mouse
+    }
+
+    InputDeviceModel {
+        id: touchPadModel
+        deviceFilter: InputInfo.TouchPad
+    }
+
+    InputDeviceModel {
+        id: touchScreenModel
+        deviceFilter: InputInfo.TouchScreen
+    }
+
     currentWebcontext: currentWebview ? currentWebview.context : null
 
     actions: [
@@ -274,6 +296,156 @@
         }
     }
 
+    readonly property var downloadManager: (downloadHandlerLoader.status == Loader.Ready) ? downloadHandlerLoader.item : null
+
+    Loader {
+        id: downloadHandlerLoader
+        source: "../DownloadHandler.qml"
+        asynchronous: true
+    }
+
+    Component.onCompleted: {
+        DownloadsModel.databasePath = dataLocation + "/downloads.sqlite"
+    }
+
+    // Until a proper workaround landed in the UbuntuSDK:
+    // https://bugs.launchpad.net/bugs/1536669
+    onHasMouseChanged: QuickUtils.mouseAttached = hasMouse
+
+    BottomEdge {
+        id: bottomEdge
+        height: parent.height
+
+        hint.text: "Downloads"
+
+        contentComponent: DownloadsPage {
+            header: PageHeader {
+                title: i18n.tr("Downloads")
+            }
+
+            width: webapp.width
+            height: webapp.height
+
+            downloadManager: webapp.downloadManager
+        }
+    }
+
+    Loader {
+        id: contentHandlerLoader
+        source: "../ContentHandler.qml"
+        asynchronous: true
+    }
+
+    QtObject {
+        id: internal
+
+        function instantiateShareComponent() {
+            var component = Qt.createComponent("../Share.qml")
+            if (component.status === Component.Ready) {
+                var share = component.createObject(webappWebview)
+                share.onDone.connect(share.destroy)
+                return share
+            }
+            return null
+        }
+
+        function shareLink(url, title) {
+            var share = instantiateShareComponent()
+            if (share) share.shareLink(url, title)
+        }
+
+        function shareText(text) {
+            var share = instantiateShareComponent()
+            if (share) share.shareText(text)
+        }
+    }
+
+    Connections {
+        target: containerWebView
+        onShowDownloadDialog: {
+            if (downloadDialogLoader.status === Loader.Ready) {
+//                bottomEdge.commit()
+
+                var downloadDialog =
+                       PopupUtils.open(downloadDialogLoader.item,
+                                       webapp,
+                                       {"contentType" : contentType,
+                                        "downloadId" : downloadId,
+                                        "singleDownload" : downloader,
+                                        "filename" : filename,
+                                        "mimeType" : mimeType})
+               downloadDialog.startDownload.connect(startDownload)
+            }
+        }
+    }
+
+    function startDownload(downloadId, download, mimeType) {
+        DownloadsModel.add(downloadId, download.url, mimeType)
+        download.start()
+        downloadsViewLoader.active = true
+    }
+
+    function showDownloadsPage() {
+        downloadsViewLoader.active = true
+        return downloadsViewLoader.item
+    }
+
+    Loader {
+        id: downloadDialogLoader
+        source: "ContentDownloadDialog.qml"
+        asynchronous: true
+    }
+
+    Loader {
+        id: filePickerLoader
+        source: "ContentPickerDialog.qml"
+        asynchronous: true
+    }
+
+    Loader {
+        id: downloadsViewLoader
+
+        anchors.fill: parent
+        active: false
+        source: "../DownloadsPage.qml"
+
+        Binding {
+            target: downloadsViewLoader.item
+            property: "downloadManager"
+            value: webapp.downloadManager
+        }
+        Binding {
+            target: downloadsViewLoader.item
+            property: "focus"
+            value: true
+        }
+        Connections {
+            target: downloadsViewLoader.item
+            onDone: downloadsViewLoader.active = false
+        }
+
+        onStatusChanged: {
+            if (status == Loader.Ready) {
+                forceActiveFocus()
+            } else {
+                internal.resetFocus()
+            }
+        }
+    }
+
+    Connections {
+        target: contentHandlerLoader.item
+        onExportFromDownloads: {
+            if (downloadHandlerLoader.status == Loader.Ready) {
+                downloadsViewLoader.active = true
+                downloadsViewLoader.item.mimetypeFilter = mimetypeFilter
+                downloadsViewLoader.item.activeTransfer = transfer
+                downloadsViewLoader.item.multiSelect = multiSelect
+                downloadsViewLoader.item.pickingMode = true
+            }
+        }
+    }
+
     UnityWebApps.UnityWebApps {
         id: unityWebapps
         name: webappName

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2016-09-01 14:43:39 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import webbrowsercommon.private 0.2
 import "../actions" as Actions
 import ".."
 
@@ -45,6 +46,7 @@
 
     signal samlRequestUrlPatternReceived(string urlPattern)
     signal themeColorMetaInformationDetected(string theme_color)
+    signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType)
 
     onWideChanged: {
         if (webappContainerWebViewLoader.item
@@ -77,7 +79,11 @@
                 }
             }
         }
-
+        onShowDownloadDialog: {
+            containerWebview.showDownloadDialog(
+                        downloadId, contentType,
+                        downloader, filename, mimeType)
+        }
     }
 
     Connections {
@@ -85,13 +91,14 @@
         onSamlRequestUrlPatternReceived: {
             samlRequestUrlPatternReceived(urlPattern)
         }
-    }
-
-    Connections {
-        target: webappContainerWebViewLoader.item
         onThemeColorMetaInformationDetected: {
             themeColorMetaInformationDetected(theme_color)
         }
+        onShowDownloadDialog: {
+            containerWebview.showDownloadDialog(
+                        downloadId, contentType,
+                        downloader, filename, mimeType)
+        }
     }
 
     Loader {

=== modified file 'src/app/webcontainer/WebappWebview.qml'
--- src/app/webcontainer/WebappWebview.qml	2016-03-16 15:17:34 +0000
+++ src/app/webcontainer/WebappWebview.qml	2016-09-01 14:43:39 +0000
@@ -21,6 +21,8 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Web 0.2
+import webbrowsercommon.private 0.2
+
 import "../actions" as Actions
 import ".."
 
@@ -30,7 +32,6 @@
     property bool wide: false
 
     signal openUrlExternallyRequested(string url)
-
     filePicker: filePickerLoader.item
 
     property QtObject contextModel: null
@@ -50,6 +51,7 @@
             onTriggered: contextModel.saveLink()
             objectName: "SaveLinkContextualAction"
         }
+        /*
         Actions.Share {
             objectName: "ShareContextualAction"
             enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel &&
@@ -61,7 +63,7 @@
                     internal.shareText(contextModel.selectionText)
                 }
             }
-        }
+        }*/
         Actions.CopyImage {
             enabled: contextModel &&
                      (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
@@ -175,60 +177,4 @@
             requestGeolocationPermission(request)
         }
     }
-
-    Loader {
-        id: contentHandlerLoader
-        source: "../ContentHandler.qml"
-        asynchronous: true
-    }
-
-    QtObject {
-        id: internal
-
-        function instantiateShareComponent() {
-            var component = Qt.createComponent("../Share.qml")
-            if (component.status === Component.Ready) {
-                var share = component.createObject(webappWebview)
-                share.onDone.connect(share.destroy)
-                return share
-            }
-            return null
-        }
-
-        function shareLink(url, title) {
-            var share = instantiateShareComponent()
-            if (share) share.shareLink(url, title)
-        }
-
-        function shareText(text) {
-            var share = instantiateShareComponent()
-            if (share) share.shareText(text)
-        }
-    }
-
-    onShowDownloadDialog: {
-       if (downloadDialogLoader.status === Loader.Ready) {
-           var downloadDialog =
-                   PopupUtils.open(downloadDialogLoader.item,
-                                   webappWebview,
-                                   {"contentType" : contentType,
-                                    "downloadId" : downloadId,
-                                    "singleDownload" : downloader,
-                                    "filename" : filename,
-                                    "mimeType" : mimeType})
-           downloadDialog.startDownload.connect(startDownload)
-        }
-    }
-
-    Loader {
-        id: downloadDialogLoader
-        source: "ContentDownloadDialog.qml"
-        asynchronous: true
-    }
-
-    Loader {
-        id: filePickerLoader
-        source: "ContentPickerDialog.qml"
-        asynchronous: true
-    }
 }

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2016-06-20 15:07:52 +0000
+++ src/app/webcontainer/webapp-container.cpp	2016-09-01 14:43:39 +0000
@@ -27,7 +27,6 @@
 #include "url-pattern-utils.h"
 #include "webapp-container-helper.h"
 
-
 // Qt
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
@@ -79,7 +78,6 @@
 const QString WebappContainer::URL_PATTERN_SEPARATOR = ",";
 const QString WebappContainer::LOCAL_SCHEME_FILTER_FILENAME = "local-scheme-filter.js";
 
-
 WebappContainer::WebappContainer(int& argc, char** argv):
     BrowserApplication(argc, argv),
     m_accountSwitcher(false),
@@ -88,9 +86,7 @@
     m_addressBarVisible(false),
     m_localWebappManifest(false),
     m_openExternalUrlInOverlay(false),
-    m_webappContainerHelper(new WebappContainerHelper())
-{
-}
+    m_webappContainerHelper(new WebappContainerHelper()) {}
 
 QString WebappContainer::appId() const
 {
@@ -123,7 +119,6 @@
     if (BrowserApplication::initialize(
                 "webcontainer/webapp-container.qml",
                 QString::fromUtf8(qgetenv("APP_ID")))) {
-
         parseCommandLine();
         parseExtraConfiguration();
 

=== modified file 'tests/unittests/downloads-model/CMakeLists.txt'
--- tests/unittests/downloads-model/CMakeLists.txt	2015-12-11 13:38:52 +0000
+++ tests/unittests/downloads-model/CMakeLists.txt	2016-09-01 14:43:39 +0000
@@ -2,8 +2,8 @@
 find_package(Qt5Sql REQUIRED)
 find_package(Qt5Test REQUIRED)
 set(TEST tst_DownloadsModelTests)
-add_executable(${TEST} tst_DownloadsModelTests.cpp)
-include_directories(${webbrowser-app_SOURCE_DIR})
+add_executable(${TEST} tst_DownloadsModelTests.cpp ${webbrowser-common_SOURCE_DIR}/downloads-model.cpp)
+include_directories(${webbrowser-common_SOURCE_DIR})
 target_link_libraries(${TEST}
     Qt5::Core
     Qt5::Sql