OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 13 matching lines...) Expand all Loading... |
24 | 24 |
25 #include "modules/mediastream/UserMediaController.h" | 25 #include "modules/mediastream/UserMediaController.h" |
26 | 26 |
27 namespace blink { | 27 namespace blink { |
28 | 28 |
29 const char* UserMediaController::supplementName() { | 29 const char* UserMediaController::supplementName() { |
30 return "UserMediaController"; | 30 return "UserMediaController"; |
31 } | 31 } |
32 | 32 |
33 UserMediaController::UserMediaController( | 33 UserMediaController::UserMediaController( |
| 34 LocalFrame& frame, |
34 std::unique_ptr<UserMediaClient> client) | 35 std::unique_ptr<UserMediaClient> client) |
35 : m_client(std::move(client)) {} | 36 : Supplement<LocalFrame>(frame), m_client(std::move(client)) {} |
36 | 37 |
37 DEFINE_TRACE(UserMediaController) { | 38 DEFINE_TRACE(UserMediaController) { |
38 Supplement<LocalFrame>::trace(visitor); | 39 Supplement<LocalFrame>::trace(visitor); |
39 } | 40 } |
40 | 41 |
41 UserMediaController* UserMediaController::create( | |
42 std::unique_ptr<UserMediaClient> client) { | |
43 return new UserMediaController(std::move(client)); | |
44 } | |
45 | |
46 void provideUserMediaTo(LocalFrame& frame, | 42 void provideUserMediaTo(LocalFrame& frame, |
47 std::unique_ptr<UserMediaClient> client) { | 43 std::unique_ptr<UserMediaClient> client) { |
48 UserMediaController::provideTo( | 44 UserMediaController::provideTo( |
49 frame, UserMediaController::supplementName(), | 45 frame, UserMediaController::supplementName(), |
50 UserMediaController::create(std::move(client))); | 46 new UserMediaController(frame, std::move(client))); |
51 } | 47 } |
52 | 48 |
53 } // namespace blink | 49 } // namespace blink |
OLD | NEW |