chrome.desktopCapture and chrome.tabCapture
Merge pull request #2695 from ki0ki0/capture

chrome.desktopCapture and chrome.tabCapture