Looks like a size method got left behind in the gfx update. Also make sure th...

chrome/browser/views/page_info_window.cc

 // Copyright (c) 2006-2008 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/page_info_window.h"
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 
 #include "base/string_util.h"
@@ skipping 423 matching lines @@
 // PageInfoContentView
 class PageInfoContentView : public views::View {
  public:
   PageInfoContentView() : cert_viewer_button_(NULL) {}
 
   void set_cert_viewer_button(views::NativeButton* cert_viewer_button) {
     cert_viewer_button_ = cert_viewer_button;
   }
 
   // views::View overrides:
-  virtual void GetPreferredSize(CSize *out) {
-    DCHECK(out);
-    *out = views::Window::GetLocalizedContentsSize(
+  virtual gfx::Size GetPreferredSize() {
+    return gfx::Size(views::Window::GetLocalizedContentsSize(
         IDS_PAGEINFO_DIALOG_WIDTH_CHARS,
-        IDS_PAGEINFO_DIALOG_HEIGHT_LINES).ToSIZE();
+        IDS_PAGEINFO_DIALOG_HEIGHT_LINES));
   }
 
   virtual void Layout() {
     if (cert_viewer_button_) {
       gfx::Size ps = cert_viewer_button_->GetPreferredSize();
 
       gfx::Rect parent_bounds = GetParent()->GetLocalBounds(false);
       int y_buttons =
           parent_bounds.bottom() - ps.height() - kButtonVEdgeMargin;
       cert_viewer_button_->SetBounds(kPanelHorizMargin, y_buttons, ps.width(),
@@ skipping 150 matching lines @@
                                         bool maximized,
                                         bool always_on_top) {
   window()->SaveWindowPositionToPrefService(g_browser_process->local_state(),
                                             prefs::kPageInfoWindowPlacement,
                                             bounds, maximized, always_on_top);
 }
 
 bool PageInfoWindow::RestoreWindowPosition(CRect* bounds,
                                            bool* maximized,
                                            bool* always_on_top) {
-  return window()->RestoreWindowPositionFromPrefService(
+  bool restore = window()->RestoreWindowPositionFromPrefService(
       g_browser_process->local_state(),
       prefs::kPageInfoWindowPlacement,
       bounds, maximized, always_on_top);
+
+  if (restore) {
+    // Force the correct width and height in case we've changed it
+    // or the pref got messed up (we know that some users will have
+    // the wrong preference if they ran into bug 3509). This isn't 
+    // a resizable dialog, so overriding the saved width and height
+    // shouldn't be noticable.
+    gfx::Size size = contents_->GetPreferredSize();
+    bounds->right = bounds->left + size.width();
+    bounds->bottom = bounds->top + size.height();
+  }
+
+  return restore;
 }
 
 views::View* PageInfoWindow::GetContentsView() {
   return contents_;
 }
 
 void PageInfoWindow::ButtonPressed(views::NativeButton* sender) {
   if (sender == cert_info_button_) {
     DCHECK(cert_id_ != 0);
     ShowCertDialog(cert_id_);
@@ skipping 58 matching lines @@
   HCERTSTORE cert_store = view_info.pCertContext->hCertStore;
   view_info.cStores = 1;
   view_info.rghStores = &cert_store;
   BOOL properties_changed;
 
   // This next call blocks but keeps processing windows messages, making it
   // modal to the browser window.
   BOOL rv = ::CryptUIDlgViewCertificate(&view_info, &properties_changed);
 }