Fix a bug in the first run dialog where the "Google Chrome is ready to

complete your installation." text would overlap the product icon.

BUG=1252749
TEST=chrome --lang=el --first-run and verify that the text wraps

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@602 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index 404c732..ce689d2 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -126,11 +126,15 @@ void FirstRunView::Layout() {
   FirstRunViewBase::Layout();
 
   const int kVertSpacing = 8;
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   CSize pref_size;
   welcome_label_->GetPreferredSize(&pref_size);
+  // Wrap the label text before we overlap the product icon.
+  int label_width = background_image()->GetWidth() -
+      rb.GetBitmapNamed(IDR_WIZARD_ICON)->width() - kPanelHorizMargin;
   welcome_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin,
-                            pref_size.cx, pref_size.cy);
+                            label_width, pref_size.cy);
   AdjustDialogWidth(welcome_label_);
 
   int next_v_space = background_image()->GetY() +
@@ -144,7 +148,7 @@ void FirstRunView::Layout() {
   next_v_space = actions_label_->GetY() +
                  actions_label_->GetHeight() + kVertSpacing;
 
-  int label_width = GetWidth() - (2 * kPanelHorizMargin);
+  label_width = GetWidth() - (2 * kPanelHorizMargin);
   int label_height = actions_import_->GetHeightForWidth(label_width);
   actions_import_->SetBounds(kPanelHorizMargin, next_v_space, label_width,
                              label_height);