Fix crash due to parsing of raw branch code from Google Update

chrome/browser/views/about_chrome_view.cc

 // Copyright (c) 2009 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/browser/views/about_chrome_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "base/i18n/word_iterator.h"
 #include "app/l10n_util.h"
@@ skipping 119 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   if (version_info.get() == NULL) {
     NOTREACHED() << L"Failed to initialize about window";
     return;
   }
 
   current_version_ = version_info->file_version();
-#if !defined(GOOGLE_CHROME_BUILD)
-  current_version_ += L" (";
-  current_version_ += version_info->last_change();
-  current_version_ += L")";
-#endif
 
   string16 version_modifier = platform_util::GetVersionStringModifier();
   if (version_modifier.length()) {
-    current_version_ += L" ";
-    current_version_ += UTF16ToWide(version_modifier);
+    version_details_ += L" ";
+    version_details_ += UTF16ToWide(version_modifier);
   }
 
+#if !defined(GOOGLE_CHROME_BUILD)
+  version_details_ += L" (";
+  version_details_ += version_info->last_change();
+  version_details_ += L")";
+#endif
+
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
   throbber_.reset(new views::Throbber(50, true));
   throbber_->set_parent_owned(false);
   throbber_->SetVisible(false);
 
   SkBitmap* success_image = rb.GetBitmapNamed(IDR_UPDATE_UPTODATE);
   success_indicator_.SetImage(*success_image);
   success_indicator_.set_parent_owned(false);
 
@@ skipping 25 matching lines @@
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       l10n_util::GetString(IDS_PRODUCT_NAME));
   about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetColor(SK_ColorBLACK);
   AddChildView(about_title_label_);
 
   // This is a text field so people can copy the version number from the dialog.
   version_label_ = new views::Textfield();
-  version_label_->SetText(WideToUTF16Hack(current_version_));
+  version_label_->SetText(WideToUTF16Hack(current_version_ + version_details_));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
   version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont));
   AddChildView(version_label_);
 
 #if defined(OS_CHROMEOS)
   os_version_label_ = new views::Textfield();
@@ skipping 702 matching lines @@
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif