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 { | 30 { |
31 return "UserMediaController"; | 31 return "UserMediaController"; |
32 } | 32 } |
33 | 33 |
34 UserMediaController::UserMediaController(UserMediaClient* client) | 34 UserMediaController::UserMediaController(std::unique_ptr<UserMediaClient> client
) |
35 : m_client(client) | 35 : m_client(std::move(client)) |
36 { | 36 { |
37 } | 37 } |
38 | 38 |
39 DEFINE_TRACE(UserMediaController) | 39 DEFINE_TRACE(UserMediaController) |
40 { | 40 { |
41 Supplement<LocalFrame>::trace(visitor); | 41 Supplement<LocalFrame>::trace(visitor); |
42 } | 42 } |
43 | 43 |
44 UserMediaController* UserMediaController::create(UserMediaClient* client) | 44 UserMediaController* UserMediaController::create(std::unique_ptr<UserMediaClient
> client) |
45 { | 45 { |
46 return new UserMediaController(client); | 46 return new UserMediaController(std::move(client)); |
47 } | 47 } |
48 | 48 |
49 void provideUserMediaTo(LocalFrame& frame, UserMediaClient* client) | 49 void provideUserMediaTo(LocalFrame& frame, std::unique_ptr<UserMediaClient> clie
nt) |
50 { | 50 { |
51 UserMediaController::provideTo(frame, UserMediaController::supplementName(),
UserMediaController::create(client)); | 51 UserMediaController::provideTo(frame, UserMediaController::supplementName(),
UserMediaController::create(std::move(client))); |
52 } | 52 } |
53 | 53 |
54 } // namespace blink | 54 } // namespace blink |
OLD | NEW |