OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "printing/backend/win_helper.h" | 5 #include "printing/backend/win_helper.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_version_info.h" | 10 #include "base/file_version_info.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 FileVersionInfo::CreateFileVersionInfo( | 360 FileVersionInfo::CreateFileVersionInfo( |
361 FilePath(driver->pDriverPath))); | 361 FilePath(driver->pDriverPath))); |
362 info[1] = WideToUTF8(version_info->file_version()); | 362 info[1] = WideToUTF8(version_info->file_version()); |
363 info[2] = WideToUTF8(version_info->product_name()); | 363 info[2] = WideToUTF8(version_info->product_name()); |
364 info[3] = WideToUTF8(version_info->product_version()); | 364 info[3] = WideToUTF8(version_info->product_version()); |
365 } | 365 } |
366 | 366 |
367 for (size_t i = 0; i < arraysize(info); ++i) { | 367 for (size_t i = 0; i < arraysize(info); ++i) { |
368 std::replace(info[i].begin(), info[i].end(), ';', ','); | 368 std::replace(info[i].begin(), info[i].end(), ';', ','); |
369 driver_info.append(info[i]); | 369 driver_info.append(info[i]); |
370 driver_info.append(";"); | 370 if (i < arraysize(info) - 1) |
| 371 driver_info.append(";"); |
371 } | 372 } |
372 return driver_info; | 373 return driver_info; |
373 } | 374 } |
374 | 375 |
375 } // namespace printing | 376 } // namespace printing |
OLD | NEW |