| 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/browser/api/webcam_private/visca_webcam.h" | 5 #include "extensions/browser/api/webcam_private/visca_webcam.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 weak_ptr_factory_.GetWeakPtr(), callback)); | 482 weak_ptr_factory_.GetWeakPtr(), callback)); |
| 483 } | 483 } |
| 484 if (zoom) { | 484 if (zoom) { |
| 485 // Set the default zoom value to 100 to be consistent with V4l2 webcam. | 485 // Set the default zoom value to 100 to be consistent with V4l2 webcam. |
| 486 const int kDefaultZoom = 100; | 486 const int kDefaultZoom = 100; |
| 487 SetZoom(kDefaultZoom, callback); | 487 SetZoom(kDefaultZoom, callback); |
| 488 } | 488 } |
| 489 } | 489 } |
| 490 | 490 |
| 491 void ViscaWebcam::OpenForTesting( | 491 void ViscaWebcam::OpenForTesting( |
| 492 scoped_ptr<SerialConnection> serial_connection) { | 492 std::unique_ptr<SerialConnection> serial_connection) { |
| 493 serial_connection_ = std::move(serial_connection); | 493 serial_connection_ = std::move(serial_connection); |
| 494 } | 494 } |
| 495 | 495 |
| 496 SerialConnection* ViscaWebcam::GetSerialConnectionForTesting() { | 496 SerialConnection* ViscaWebcam::GetSerialConnectionForTesting() { |
| 497 return serial_connection_.get(); | 497 return serial_connection_.get(); |
| 498 } | 498 } |
| 499 | 499 |
| 500 } // namespace extensions | 500 } // namespace extensions |
| OLD | NEW |