Unify the version string to be displayed on "About Chromium" dialog. (1/6)

chrome/common/chrome_version_info.cc

Index: chrome/common/chrome_version_info.cc
diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc
index c5a7a4311b97e23e736303ad642b9082a92ad0df..4e5d1f07389229ac8c174c817ed7007854861d7b 100644
--- a/chrome/common/chrome_version_info.cc
+++ b/chrome/common/chrome_version_info.cc
@@ -7,10 +7,11 @@
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
 #include "base/string_util.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace chrome {
 
@@ -89,11 +90,31 @@ bool VersionInfo::IsOfficialBuild() const {
 
 #endif
 
+std::string VersionInfo::CreateVersionString() const {
+  std::string current_version;
+  if (is_valid()) {
+    current_version += Version();
+#if !defined(GOOGLE_CHROME_BUILD)
+    current_version += " (";
+    current_version += l10n_util::GetStringUTF8(IDS_ABOUT_VERSION_UNOFFICIAL);

[tony, 2011/07/21 17:32:50]

What happened to the version_info.IsOfficialBuild() check?

[haraken1, 2011/07/22 00:08:19]

Here is inside the block of "#if !defined(GOOGLE_CHROME_BUILD)", and so there is
no case of the official build(, as Mark indicated previously.) 

+    current_version += " ";
+    current_version += LastChange();
+    current_version += " ";
+    current_version += OSType();
+    current_version += ")";
+#endif
+    std::string modifier = GetVersionStringModifier();
+    if (!modifier.empty())
+      current_version += " " + modifier;
+  }
+  return current_version;
+}
+
 std::string VersionInfo::OSType() const {
 #if defined(OS_WIN)
   return "Windows";
 #elif defined(OS_MACOSX)
-  return "Mac OS";
+  return "Mac OS X";

[tony, 2011/07/21 17:32:50]

I would put this in the mac change for mark to review.

[haraken1, 2011/07/22 00:08:19]

Done.

 #elif defined(OS_CHROMEOS)
   return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
 #elif defined(OS_LINUX)