Merge lp://qastaging/~chrisccoulson/oxide/notifications into lp://qastaging/~oxide-developers/oxide/oxide.trunk

Proposed by Chris Coulson
Status: Merged
Merged at revision: 1201
Proposed branch: lp://qastaging/~chrisccoulson/oxide/notifications
Merge into: lp://qastaging/~oxide-developers/oxide/oxide.trunk
Diff against target: 1818 lines (+1424/-12)
37 files modified
build/system.gyp (+36/-0)
qt/core/browser/oxide_qt_browser_platform_integration.cc (+8/-8)
qt/core/browser/oxide_qt_browser_platform_integration.h (+2/-2)
qt/core/browser/oxide_qt_web_view.cc (+10/-0)
qt/core/browser/oxide_qt_web_view.h (+2/-0)
qt/core/glue/oxide_qt_web_view_proxy_client.h (+4/-1)
qt/qmlplugin/oxide_qml_plugin.cc (+2/-0)
qt/quick/api/oxideqquickwebview.cc (+23/-0)
qt/quick/api/oxideqquickwebview_p.h (+1/-0)
qt/quick/api/oxideqquickwebview_p_p.h (+3/-0)
qt/tests/qmltests/TestWebView.qml (+1/-1)
qt/tests/qmltests/api/tst_NotificationPermissionRequest.html (+19/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest.js (+6/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest.qml (+185/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest_session_persist.html (+19/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest_session_persist.js (+6/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest_session_persist.qml (+241/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest_session_persist_embedder.html (+3/-0)
qt/tests/qmltests/api/tst_NotificationPermissionRequest_subframe.html (+3/-0)
shared/browser/notifications/oxide_notification_data.h (+42/-0)
shared/browser/notifications/oxide_notification_delegate_proxy.cc (+42/-0)
shared/browser/notifications/oxide_notification_delegate_proxy.h (+55/-0)
shared/browser/notifications/oxide_notification_dispatcher.h (+51/-0)
shared/browser/notifications/oxide_notification_id.h (+50/-0)
shared/browser/notifications/oxide_platform_notification_service.cc (+158/-0)
shared/browser/notifications/oxide_platform_notification_service.h (+80/-0)
shared/browser/notifications/oxide_system_notification_dispatcher.h (+34/-0)
shared/browser/notifications/oxide_system_notification_dispatcher_linux.cc (+289/-0)
shared/browser/oxide_browser_context.cc (+4/-0)
shared/browser/oxide_browser_context.h (+5/-0)
shared/browser/oxide_content_browser_client.cc (+6/-0)
shared/browser/oxide_content_browser_client.h (+1/-0)
shared/browser/permissions/oxide_permission_manager.cc (+14/-0)
shared/browser/permissions/oxide_permission_request_dispatcher.cc (+3/-0)
shared/browser/permissions/oxide_permission_request_dispatcher_client.h (+3/-0)
shared/browser/permissions/oxide_temporary_saved_permission_context.h (+1/-0)
shared/shared.gyp (+12/-0)
To merge this branch: bzr merge lp://qastaging/~chrisccoulson/oxide/notifications
Reviewer Review Type Date Requested Status
Chris Coulson Pending
Review via email: mp+272498@code.qastaging.launchpad.net
To post a comment you must log in.
1136. By Chris Coulson

Remove a couple of superfluous additions

1137. By Chris Coulson

Update tests

1138. By Chris Coulson

Test session persistence

Preview Diff

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

Subscribers

People subscribed via source and target branches