Oxide

Merge lp:~abreu-alexandre/oxide/fix-trunk-build into lp:~oxide-developers/oxide/oxide.trunk

  1. fix-trunk-build
  2. Merge into oxide.trunk
Proposed by Alexandre Abreu
Status: Merged
Merged at revision: 1272
Proposed branch: lp:~abreu-alexandre/oxide/fix-trunk-build
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 48 lines (+9/-7)
3 files modified
shared/renderer/media/oxide_media_info_loader.cc (+3/-3)
shared/renderer/media/oxide_web_media_player.cc (+3/-2)
shared/renderer/media/oxide_web_media_player.h (+3/-2)
To merge this branch: bzr merge lp:~abreu-alexandre/oxide/fix-trunk-build
Reviewer Review Type Date Requested Status
Olivier Tilloy (community) Approve
Chris Coulson Pending
Review via email: mp+277021@code.launchpad.net

Commit message

Fix trunk build

Description of the change

Fix trunk build

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shared/renderer/media/oxide_media_info_loader.cc'
2--- shared/renderer/media/oxide_media_info_loader.cc 2015-01-08 04:25:52 +0000
3+++ shared/renderer/media/oxide_media_info_loader.cc 2015-11-09 15:28:46 +0000
4@@ -103,9 +103,9 @@
5 WebURLLoader* loader,
6 const WebURLResponse& response) {
7 DVLOG(1) << "didReceiveResponse: HTTP/"
8- << (response.httpVersion() == WebURLResponse::HTTP_0_9 ? "0.9" :
9- response.httpVersion() == WebURLResponse::HTTP_1_0 ? "1.0" :
10- response.httpVersion() == WebURLResponse::HTTP_1_1 ? "1.1" :
11+ << (response.httpVersion() == WebURLResponse::HTTPVersion_0_9 ? "0.9" :
12+ response.httpVersion() == WebURLResponse::HTTPVersion_1_0 ? "1.0" :
13+ response.httpVersion() == WebURLResponse::HTTPVersion_1_1 ? "1.1" :
14 "Unknown")
15 << " " << response.httpStatusCode();
16 DCHECK(active_loader_.get());
17
18=== modified file 'shared/renderer/media/oxide_web_media_player.cc'
19--- shared/renderer/media/oxide_web_media_player.cc 2015-10-02 00:35:36 +0000
20+++ shared/renderer/media/oxide_web_media_player.cc 2015-11-09 15:28:46 +0000
21@@ -213,8 +213,9 @@
22 }
23
24 void WebMediaPlayer::setSinkId(
25- const blink::WebString& deviceId,
26- blink::WebCallbacks<void, blink::WebSetSinkIdError*>*) {
27+ const blink::WebString& sinkId,
28+ const blink::WebSecurityOrigin& origin,
29+ blink::WebSetSinkIdCallbacks* callbacks) {
30 NOTIMPLEMENTED();
31 }
32
33
34=== modified file 'shared/renderer/media/oxide_web_media_player.h'
35--- shared/renderer/media/oxide_web_media_player.h 2015-08-25 20:42:44 +0000
36+++ shared/renderer/media/oxide_web_media_player.h 2015-11-09 15:28:46 +0000
37@@ -67,8 +67,9 @@
38 void exitFullscreen();
39 bool canEnterFullscreen() const;
40 void setSinkId(
41- const blink::WebString& deviceId,
42- blink::WebCallbacks<void, blink::WebSetSinkIdError*>*);
43+ const blink::WebString& sinkId,
44+ const blink::WebSecurityOrigin& origin,
45+ blink::WebSetSinkIdCallbacks* callbacks);
46
47 // Resource loading.
48 void load(LoadType load_type,

Subscribers

People subscribed via source and target branches