Oxide

Merge lp:~justinmcp/oxide/1505048-1.11 into lp:oxide/1.11

  1. 1505048-1.11
  2. Merge into 1.11
Proposed by Justin McPherson
Status: Merged
Merged at revision: 1227
Proposed branch: lp:~justinmcp/oxide/1505048-1.11
Merge into: lp:oxide/1.11
Diff against target: 12 lines (+1/-1)
1 file modified
shared/browser/media/oxide_player_media_hub.h (+1/-1)
To merge this branch: bzr merge lp:~justinmcp/oxide/1505048-1.11
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+275262@code.launchpad.net

Commit message

Update for changes in implementation of base::RepeatingTimer.

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shared/browser/media/oxide_player_media_hub.h'
2--- shared/browser/media/oxide_player_media_hub.h 2015-09-09 07:18:04 +0000
3+++ shared/browser/media/oxide_player_media_hub.h 2015-10-22 01:32:36 +0000
4@@ -103,7 +103,7 @@
5
6 base::WeakPtrFactory<MediaPlayerMediaHub> weak_factory_;
7
8- base::RepeatingTimer<MediaPlayerMediaHub> timer_;
9+ base::RepeatingTimer timer_;
10
11 DISALLOW_COPY_AND_ASSIGN(MediaPlayerMediaHub);
12 };

Subscribers

People subscribed via source and target branches