OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "extensions/renderer/api/display_source/display_source_session.h" | 5 #include "extensions/renderer/api/display_source/display_source_session.h" |
6 | 6 |
7 #if defined(ENABLE_WIFI_DISPLAY) | 7 #if defined(ENABLE_WIFI_DISPLAY) |
8 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_sessi
on.h" | 8 #include "extensions/renderer/api/display_source/wifi_display/wifi_display_sessi
on.h" |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 17 matching lines...) Expand all Loading... |
28 void DisplaySourceSession::SetNotificationCallbacks( | 28 void DisplaySourceSession::SetNotificationCallbacks( |
29 const base::Closure& terminated_callback, | 29 const base::Closure& terminated_callback, |
30 const ErrorCallback& error_callback) { | 30 const ErrorCallback& error_callback) { |
31 DCHECK(terminated_callback_.is_null()); | 31 DCHECK(terminated_callback_.is_null()); |
32 DCHECK(error_callback_.is_null()); | 32 DCHECK(error_callback_.is_null()); |
33 | 33 |
34 terminated_callback_ = terminated_callback; | 34 terminated_callback_ = terminated_callback; |
35 error_callback_ = error_callback; | 35 error_callback_ = error_callback; |
36 } | 36 } |
37 | 37 |
38 scoped_ptr<DisplaySourceSession> DisplaySourceSessionFactory::CreateSession( | 38 std::unique_ptr<DisplaySourceSession> |
| 39 DisplaySourceSessionFactory::CreateSession( |
39 const DisplaySourceSessionParams& params) { | 40 const DisplaySourceSessionParams& params) { |
40 #if defined(ENABLE_WIFI_DISPLAY) | 41 #if defined(ENABLE_WIFI_DISPLAY) |
41 return scoped_ptr<DisplaySourceSession>(new WiFiDisplaySession(params)); | 42 return std::unique_ptr<DisplaySourceSession>(new WiFiDisplaySession(params)); |
42 #endif | 43 #endif |
43 return nullptr; | 44 return nullptr; |
44 } | 45 } |
45 | 46 |
46 } // namespace extensions | 47 } // namespace extensions |
OLD | NEW |