Unify the version string to be displayed on "About Chromium" dialog.

chrome/common/chrome_version_info.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_version_info.h"
 
 #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 {
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // On Windows and Mac, we get the Chrome version info by querying
 // FileVersionInfo for the current module.
 
 VersionInfo::VersionInfo() {
   // The current module is already loaded in memory, so this will be cheap.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ skipping 58 matching lines @@
 std::string VersionInfo::LastChange() const {
   return LAST_CHANGE;
 }
 
 bool VersionInfo::IsOfficialBuild() const {
   return OFFICIAL_BUILD;
 }
 
 #endif
 
+std::string VersionInfo::CreateVersionString() const {
+  std::string current_version;
+#if !defined(NACL_WIN64)
+  if (is_valid()) {
+    current_version += Version();
+#if !defined(GOOGLE_CHROME_BUILD)
+    current_version += " (";
+    current_version += l10n_util::GetStringUTF8(
+        IsOfficialBuild() ?

[Mark Mentovai, 2011/06/30 13:34:23]

What does this even mean in the context of !defined(GOOGLE_CHROME_BUILD)?

[haraken1, 2011/07/04 07:50:52]

Fixed it. As you pointed out, IsOfficialBuild() is always false here.

+        IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
+    current_version += " ";
+    current_version += OSType();

[Mark Mentovai, 2011/06/30 13:34:23]

Why? This seems to be all of obvious, out-of-place, and unnecessary.

[haraken1, 2011/07/04 07:50:52]

No change for now. I think that OS type is necessary here. Indeed it is obvious
for a user, but the purpose here is to create the version string that people can
copy and paste to the bug report site. OS type is important information in that
scenario.

+    current_version += " ";
+    current_version += LastChange();
+    current_version += ")";
+#endif
+    std::string modifier = GetVersionStringModifier();
+    if (!modifier.empty())
+      current_version += " " + modifier;
+  }
+#endif  // !defined(NACL_WIN64)
+  return current_version;
+}
+
 std::string VersionInfo::OSType() const {
 #if defined(OS_WIN)
   return "Windows";
 #elif defined(OS_MACOSX)
   return "Mac OS";
 #elif defined(OS_CHROMEOS)
   return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
 #elif defined(OS_LINUX)
   return "Linux";
 #elif defined(OS_FREEBSD)
   return "FreeBSD";
 #elif defined(OS_OPENBSD)
   return "OpenBSD";
 #elif defined(OS_SOLARIS)
   return "Solaris";
 #else
   return "Unknown";
 #endif
 }
 
 }  // namespace chrome