Fix first run OEM bubble size issue....

chrome/browser/views/first_run_bubble.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/first_run_bubble.h"
 
+#include "app/gfx/font_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "app/win_util.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 308 matching lines @@
   int next_v_space =
       label1_->y() + pref_size.height() + kRelatedControlSmallVerticalSpacing;
 
   pref_size = label3_->GetPreferredSize();
   label3_->SetBounds(kOEMBubblePadding, next_v_space,
                      canvas.width() - kOEMBubblePadding * 2,
                      pref_size.height());
 }
 
 gfx::Size FirstRunOEMBubbleView::GetPreferredSize() {
-  return gfx::Size(views::Window::GetLocalizedContentsSize(
-      IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS,
-      IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES));
+  // Calculate width based on font and text.
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  const gfx::Font& font = rb.GetFont(
+      ResourceBundle::MediumFont).DeriveFont(3, gfx::Font::BOLD);
+  gfx::Size size = gfx::Size(
+      gfx::GetLocalizedContentsWidthForFont(
+          IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS, font),
+      gfx::GetLocalizedContentsHeightForFont(
+          IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES, font));
+
+  // WARNING: HACK. Vista and XP calculate font size differently; this means
+  // that a dialog box correctly proportioned for XP will appear too large in
+  // Vista. The correct thing to do is to change font size calculations in
+  // XP or Vista so that the length of a string is calculated properly. For
+  // now, we force Vista to show a correctly-sized box by taking account of
+  // the difference in font size calculation. The coefficient should not be
+  // stored in a variable because it's a hack and should go away.
+  if (win_util::ShouldUseVistaFrame()) {
+    size.set_width(static_cast<int>(size.width() * 0.85));
+    size.set_height(static_cast<int>(size.height() * 0.85));
+  }
+  return size;
 }
 
 void FirstRunOEMBubbleView::FocusWillChange(View* focused_before,
                                             View* focused_now) {
   // No buttons in oem_bubble to register focus changes.
 }
 
 // FirstRunBubble -------------------------------------------------------------
 
 // static
@@ skipping 58 matching lines @@
 }
 
 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                        bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
   enable_window_method_factory_.RevokeAll();
   GetFocusManager()->RemoveFocusChangeListener(view_);
 }