Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2905)

Unified Diff: chrome/installer/test/alternate_version_generator.h

Issue 2273103002: Return version of the generated file in GenerateAlternatePEFileVersion. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/test/alternate_version_generator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/test/alternate_version_generator.h
diff --git a/chrome/installer/test/alternate_version_generator.h b/chrome/installer/test/alternate_version_generator.h
index b75b381fa23a0169b971bc26be87e798be411b52..c887c307c27640becd30f6b4b58f7d90c036e63b 100644
--- a/chrome/installer/test/alternate_version_generator.h
+++ b/chrome/installer/test/alternate_version_generator.h
@@ -7,7 +7,7 @@
#ifndef CHROME_INSTALLER_TEST_ALTERNATE_VERSION_GENERATOR_H_
#define CHROME_INSTALLER_TEST_ALTERNATE_VERSION_GENERATOR_H_
-#include <string>
+#include "base/strings/string16.h"
namespace base {
class FilePath;
@@ -30,16 +30,18 @@ enum Direction {
bool GenerateAlternateVersion(const base::FilePath& original_installer_path,
const base::FilePath& target_path,
Direction direction,
- std::wstring* original_version,
- std::wstring* new_version);
+ base::string16* original_version,
+ base::string16* new_version);
// Given a path to a PEImage in |original_file|, copy that file to
// |target_file|, modifying the version of the copy according to |direction|.
-// Any previous file at |target_file| is clobbered. Returns true on success.
-// Note that |target_file| may still be mutated on failure.
-bool GenerateAlternatePEFileVersion(const base::FilePath& original_file,
- const base::FilePath& target_file,
- Direction direction);
+// Any previous file at |target_file| is clobbered. On success, returns the
+// version of the generated file. Otherwise, returns an empty string. Note that
+// |target_file| may still be mutated on failure.
+base::string16 GenerateAlternatePEFileVersion(
+ const base::FilePath& original_file,
+ const base::FilePath& target_file,
+ Direction direction);
// Given a path to a PEImage in |original_file|, copy that file to
// |target_file|, modifying the version of the copy according to |version|.
« no previous file with comments | « no previous file | chrome/installer/test/alternate_version_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698