Get Chrome About dialog 'official build' label to display properly.

chrome/browser/ui/views/about_chrome_view.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/browser/ui/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
 #include <algorithm>
-#include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 20 matching lines @@
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/restart_message_box.h"
 #include "chrome/installer/util/install_util.h"
 #endif  // defined(OS_WIN)
 
 namespace {
-// The pixel width of the version text field. Ideally, we'd like to have the
-// bounds set to the edge of the icon. However, the icon is not a view but a
-// part of the background, so we have to hard code the width to make sure
-// the version field doesn't overlap it.
-const int kVersionFieldWidth = 195;
-
 // These are used as placeholder text around the links in the text in the about
 // dialog.
 const wchar_t* kBeginLink = L"BEGIN_LINK";
 const wchar_t* kEndLink = L"END_LINK";
 const wchar_t* kBeginLinkChr = L"BEGIN_LINK_CHR";
 const wchar_t* kBeginLinkOss = L"BEGIN_LINK_OSS";
 const wchar_t* kEndLinkChr = L"END_LINK_CHR";
 const wchar_t* kEndLinkOss = L"END_LINK_OSS";
 
 // The background bitmap used to draw the background color for the About box
@@ skipping 76 matching lines @@
   }
 
   current_version_ = version_info.Version();
 
   // This code only runs as a result of the user opening the About box so
   // doing registry access to get the version string modifier should be fine.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   std::string version_modifier =
       chrome::VersionInfo::GetVersionStringModifier();
   if (!version_modifier.empty())
-    version_details_ += " " + version_modifier;
+    version_details_ += ASCIIToUTF16(" ") + ASCIIToUTF16(version_modifier);
 
 #if !defined(GOOGLE_CHROME_BUILD)
-  version_details_ += " (";
-  version_details_ += l10n_util::GetStringUTF8(
+  version_details_ += ASCIIToUTF16(" (");
+  version_details_ += l10n_util::GetStringUTF16(
       version_info.IsOfficialBuild() ?
       IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
-  version_details_ += " ";
-  version_details_ += version_info.LastChange();
-  version_details_ += ")";
+  version_details_ += ASCIIToUTF16(" ");
+  version_details_ += ASCIIToUTF16(version_info.LastChange());
+  version_details_ += ASCIIToUTF16(")");
 #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);
@@ skipping 24 matching lines @@
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(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(ASCIIToUTF16(current_version_ + version_details_));
+  version_label_->SetText(ASCIIToUTF16(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_);
 
   os_version_label_ = new views::Textfield();
   os_version_label_->SetText(UTF8ToUTF16(version_info.OSType()));
@@ skipping 122 matching lines @@
   about_title_label_->SetBounds(
       views::kPanelHorizMargin, views::kPanelVertMargin,
       sz.width(), sz.height());
 
   // Then we have the version number right below it.
   sz = version_label_->GetPreferredSize();
   version_label_->SetBounds(views::kPanelHorizMargin,
                             about_title_label_->y() +
                                 about_title_label_->height() +
                                 views::kRelatedControlVerticalSpacing,
-                            kVersionFieldWidth,
+                            panel_size.width() -
+                                about_dlg_background_logo_->width(),
                             sz.height());
 
   // Then we have the version number right below it.
   sz = os_version_label_->GetPreferredSize();
   os_version_label_->SetBounds(
       views::kPanelHorizMargin,
       version_label_->y() +
           version_label_->height() +
           views::kRelatedControlVerticalSpacing,
-      kVersionFieldWidth,
+      panel_size.width() -
+          about_dlg_background_logo_->width(),
       sz.height());
 
   // For the width of the main text label we want to use up the whole panel
   // width and remaining height, minus a little margin on each side.
   int y_pos = background_image_height + views::kRelatedControlVerticalSpacing;
   sz.set_width(panel_size.width() - 2 * views::kPanelHorizMargin);
 
   // Draw the text right below the background image.
   copyright_label_->SetBounds(views::kPanelHorizMargin,
                               y_pos,
@@ skipping 39 matching lines @@
   sz = update_label_.GetPreferredSize();
   int update_label_x = throbber_->x() + throbber_->width() +
                        views::kRelatedControlHorizontalSpacing;
   update_label_.SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   update_label_.SetBounds(update_label_x,
                           throbber_topleft_y + 1,
                           parent_bounds.width() - update_label_x,
                           sz.height());
 }
 
-
 void AboutChromeView::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   // Draw the background image color (and the separator) across the dialog.
   // This will become the background for the logo image at the top of the
   // dialog.
   canvas->TileImageInt(*kBackgroundBmp, 0, 0,
                        dialog_dimensions_.width(), kBackgroundBmp->height());
 
   gfx::Font font =
@@ skipping 347 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif