← Back to branch summary

~abreu-alexandre/webbrowser-app/container-extension

« back to all changes in this revision

Viewing changes to src/app/webcontainer/PopupWindowController.qml

Handle media access request from webcontainer main view and overlay views Fixes: #1554202
Approved by: Olivier Tilloy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/webcontainer/PopupWindowController.qml
1
1
/*
2
 
 * Copyright 2014-2015 Canonical Ltd.
 
2
 * Copyright 2014-2016 Canonical Ltd.
3
3
 *
4
4
 * This file is part of webbrowser-app.
5
5
 *
29
29
    property var mainWebappView
30
30
    property var views: []
31
31
    property bool blockOpenExternalUrls: false
 
32
    property var mediaAccessDialogComponent
32
33
    property bool wide: false
33
34
 
34
35
    // Used to access runtime behavior during tests
197
198
        createPopupView(parentView,
198
199
                        { request: request,
199
200
                          webContext: context,
200
 
                          popupWindowController: controller },
 
201
                          popupWindowController: controller,
 
202
                          mediaAccessDialogComponent: mediaAccessDialogComponent
 
203
                        },
201
204
                        isRequestFromMainWebappWebview,
202
205
                        context)
203
206
    }
208
211
        createPopupView(parentView,
209
212
                        { url: overlayUrl,
210
213
                          webContext: context,
211
 
                          popupWindowController: controller },
 
214
                          popupWindowController: controller,
 
215
                          mediaAccessDialogComponent: mediaAccessDialogComponent
 
216
                        },
212
217
                        isRequestFromMainWebappWebview,
213
218
                        context)
214
219
    }