Fixes bug where clicks on 'ok' button in about dialog wouldn't

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)
 
@@ skipping 15 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "views/controls/button/text_button.h"
 #include "views/controls/link.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/throbber.h"
 #include "views/layout/layout_constants.h"
 #include "views/view_text_utils.h"
 #include "views/widget/widget.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
@@ skipping 348 matching lines @@
   // This image is hidden (see ViewHierarchyChanged) and displayed on demand.
   sz = update_available_indicator_.GetPreferredSize();
   update_available_indicator_.SetBounds(throbber_topleft_x, throbber_topleft_y,
                                         sz.width(), sz.height());
 
   // This image is hidden (see ViewHierarchyChanged) and displayed on demand.
   sz = timeout_indicator_.GetPreferredSize();
   timeout_indicator_.SetBounds(throbber_topleft_x, throbber_topleft_y,
                                sz.width(), sz.height());
 
-  // The update label should be at the bottom of the screen, to the right of
-  // the throbber. We specify width to the end of the dialog because it contains
-  // variable length messages.
+  // The update label should be at the bottom of the screen, to the right of the
+  // throbber. It vertically lines up with the ok button, so we make sure it
+  // doesn't extend into the ok button.
   sz = update_label_.GetPreferredSize();
   int update_label_x = throbber_->x() + throbber_->width() +
                        views::kRelatedControlHorizontalSpacing;
+  views::DialogClientView* dialog_client_view = GetDialogClientView();
+  int max_x = parent_bounds.width();
+  if (dialog_client_view->ok_button() &&
+      dialog_client_view->ok_button()->IsVisible()) {
+    max_x = std::min(dialog_client_view->ok_button()->x(), max_x);
+  }
+  if (dialog_client_view->cancel_button() &&
+      dialog_client_view->cancel_button()->IsVisible()) {
+    max_x = std::min(dialog_client_view->cancel_button()->x(), max_x);
+  }
   update_label_.SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   update_label_.SetBounds(update_label_x,
                           throbber_topleft_y + 1,
-                          parent_bounds.width() - update_label_x,
+                          std::min(max_x - update_label_x, sz.width()),
                           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,
@@ skipping 344 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