Added scale hack to work around Windows font metric issue.

chrome/browser/sync/sync_setup_flow.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/sync/sync_setup_flow.h"
 
 #include "app/gfx/font.h"
 #include "app/gfx/font_util.h"
 #include "base/histogram.h"
 #include "base/json/json_reader.h"
@@ skipping 137 matching lines @@
 SyncSetupFlow::~SyncSetupFlow() {
   flow_handler_->set_flow(NULL);
 }
 
 void SyncSetupFlow::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = service_->profile()->GetPrefs();
   gfx::Font approximate_web_font = gfx::Font::CreateFont(
       prefs->GetString(prefs::kWebKitSansSerifFontFamily),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
-  gfx::Size s = gfx::GetLocalizedContentsSizeForFont(
+  *size = gfx::GetLocalizedContentsSizeForFont(
       IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
       IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
       approximate_web_font);
 
-  size->set_width(s.width());
-  size->set_height(s.height());
+#if !defined(OS_WIN)
+  // NOTE(akalin): This is a hack to work around a problem with font height on
+  // windows.  Basically font metrics are incorrectly returned in logical units
+  // instead of pixels on Windows.  Logical units are very commonly 96 DPI
+  // so our localized char/line counts are too small by a factor of 96/72.
+  // So we compensate for this on non-windows platform.
+  //
+  // TODO(akalin): Remove this hack once we fix the windows font problem (or at
+  // least work around it in some other place).
+  float scale_hack = 96.f/72.f;
+  size->set_width(size->width() * scale_hack);
+  size->set_height(size->height() * scale_hack);
+#endif
 }
 
 // A callback to notify the delegate that the dialog closed.
 void SyncSetupFlow::OnDialogClosed(const std::string& json_retval) {
   DCHECK(json_retval.empty());
   container_->set_flow(NULL);  // Sever ties from the wizard.
   if (current_state_ == SyncSetupWizard::DONE ||
       current_state_ == SyncSetupWizard::DONE_FIRST_TIME) {
     service_->SetSyncSetupCompleted();
   }
@@ skipping 116 matching lines @@
   if (!b)
     return NULL;
 
   FlowHandler* handler = new FlowHandler();
   SyncSetupFlow* flow = new SyncSetupFlow(start, end, json_args,
       container, handler, service);
   handler->set_flow(flow);
   b->BrowserShowHtmlDialog(flow, NULL);
   return flow;
 }