← Back to branch summary

~justinmcp/oxide/media-arbitration

~justinmcp/oxide/media-arbitration

Viewing all changes in revision 1181.

Committer: Justin McPherson
Date: 2016-04-08 06:29:53 UTC
Revision ID: justin.mcpherson@canonical.com-20160408062953-p9oan93aezdmqshl

Finish merging to trunk.

files modified:
shared/browser/media/oxide_browser_media_arbitrator.cc

shared/browser/media/oxide_browser_media_arbitrator.h

shared/common/oxide_messages.h

shared/renderer/media/oxide_renderer_media_arbitrator.cc

shared/renderer/media/oxide_renderer_media_arbitrator.h

Show diffs side-by-side

added added

removed removed

shared/browser/media/oxide_browser_media_arbitrator.cc

shared/browser/media/oxide_browser_media_arbitrator.h

shared/common/oxide_messages.h

shared/renderer/media/oxide_renderer_media_arbitrator.cc

shared/renderer/media/oxide_renderer_media_arbitrator.h

Older »