| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/process/kill.h" | 8 #include "base/process/kill.h" |
| 9 #include "base/process/launch.h" | 9 #include "base/process/launch.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 if (!output.empty()) | 403 if (!output.empty()) |
| 404 msg += " and printed out:\n\n" + output; | 404 msg += " and printed out:\n\n" + output; |
| 405 else | 405 else |
| 406 msg += "."; | 406 msg += "."; |
| 407 *err = Err(function->function(), "Script returned non-zero exit code.", | 407 *err = Err(function->function(), "Script returned non-zero exit code.", |
| 408 msg); | 408 msg); |
| 409 return Value(); | 409 return Value(); |
| 410 } | 410 } |
| 411 | 411 |
| 412 // Default to None value for the input conversion if unspecified. | 412 // Default to None value for the input conversion if unspecified. |
| 413 return ConvertInputToValue(output, function, | 413 return ConvertInputToValue(scope->settings(), output, function, |
| 414 args.size() >= 3 ? args[2] : Value(), err); | 414 args.size() >= 3 ? args[2] : Value(), err); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace functions | 417 } // namespace functions |
| OLD | NEW |