diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-05 14:36:22 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-05 14:37:32 +0100 |
| commit | 28db9b54de6402bd38770ecc1d620255e9d1e78f (patch) | |
| tree | 469a957ff6b9b6d0ee9fb4074b9139cbaa050443 /chromium/chrome/common/extensions/docs/examples/api/webview/comm_demo_app/manifest.json | |
| parent | 3239a38a9b35d29e483b7bd67b786b4f9d109908 (diff) | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-28db9b54de6402bd38770ecc1d620255e9d1e78f.tar.gz | |
Merge remote-tracking branch 'origin/upstream-master' into 79-based
Conflicts:
chromium/chrome/common/pref_names.cc
chromium/chrome/common/pref_names.h
Change-Id: I9be20fb8dfd946e3db1fa298dce076db5fd1f397
Diffstat (limited to 'chromium/chrome/common/extensions/docs/examples/api/webview/comm_demo_app/manifest.json')
| -rw-r--r-- | chromium/chrome/common/extensions/docs/examples/api/webview/comm_demo_app/manifest.json | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/chromium/chrome/common/extensions/docs/examples/api/webview/comm_demo_app/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/webview/comm_demo_app/manifest.json deleted file mode 100644 index 340d590139a..00000000000 --- a/chromium/chrome/common/extensions/docs/examples/api/webview/comm_demo_app/manifest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "manifest_version": 2, - "name": "WebView Extension Communications Demo: App", - "version": "1", - "app": { - "background": { - "scripts": ["main.js"] - } - }, - "permissions": ["webview"], - "webview": { - "partitions": [ - { - "name": "partition", - "accessible_resources": [""] - } - ] - } -} |