lp:~justinmcp/oxide/mediahub

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~oxide-developers/oxide/oxide.trunk at revision 915

Chris Coulson: Approve on 2015-01-16

Diff: 3896 lines (+3622/-4) (has conflicts)

30 files modified

CMakeLists.txt (+7/-0)
patches/mediahub-support.patch (+55/-0)
patches/series (+1/-0)
shared/browser/media/oxide_browser_media_player_manager.cc (+205/-0)
shared/browser/media/oxide_browser_media_player_manager.h (+95/-0)
shared/browser/media/oxide_media_player.cc (+26/-0)
shared/browser/media/oxide_media_player.h (+75/-0)
shared/browser/media/oxide_media_web_contents_observer.cc (+77/-0)
shared/browser/media/oxide_media_web_contents_observer.h (+47/-0)
shared/browser/media/oxide_player_media_hub.cc (+213/-0)
shared/browser/media/oxide_player_media_hub.h (+112/-0)
shared/browser/oxide_browser_process_main.cc (+13/-0)
shared/browser/oxide_content_browser_client.cc (+3/-1)
shared/browser/oxide_web_view.cc (+61/-3)
shared/common/oxide_constants.cc (+2/-0)
shared/common/oxide_constants.h (+2/-0)
shared/common/oxide_message_enums.h (+6/-0)
shared/common/oxide_messages.h (+130/-0)
shared/media/mediahub.gyp (+30/-0)
shared/media/mediahub_player_shim.cc (+342/-0)
shared/media/mediahub_player_shim.h (+143/-0)
shared/renderer/media/oxide_media_info_loader.cc (+192/-0)
shared/renderer/media/oxide_media_info_loader.h (+126/-0)
shared/renderer/media/oxide_renderer_media_player_manager.cc (+233/-0)
shared/renderer/media/oxide_renderer_media_player_manager.h (+105/-0)
shared/renderer/media/oxide_web_media_player.cc (+929/-0)
shared/renderer/media/oxide_web_media_player.h (+326/-0)
shared/renderer/oxide_content_renderer_client.cc (+29/-0)
shared/renderer/oxide_content_renderer_client.h (+13/-0)
shared/shared.gyp (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1249387: hook Oxide into Ubuntu platform API for media-hub

Medium

In Progress

Link a bug report

Related blueprints

1047. By Justin McPherson <justin@phablet-dev> on 2015-06-01

WIP

1046. By Justin McPherson <justin@phablet-dev> on 2015-05-27

Merge from trunk.

1045. By Justin McPherson <justin@phablet-dev> on 2015-05-27

wip

1044. By Justin McPherson <justin@phablet-dev> on 2015-05-26

WIP.

1043. By Justin McPherson <justin@phablet-dev> on 2015-04-22

Merge from trunk.

1042. By Justin McPherson <justin@phablet-dev> on 2015-04-20

Merge from trunk.

1041. By Justin McPherson <justin@phablet-dev> on 2015-04-20

WIP

1040. By Justin McPherson <justin@phablet-dev> on 2015-04-17

WIP

1039. By Chris Coulson on 2015-04-16

Add LocationBarController.show(), LocationBarController.hide() and LocationBarController.animated

1038. By Chris Coulson on 2015-04-16

Bump Chromium rev to 43.0.2357.18