1 files changed, 22 insertions, 64 deletions

diff --git a/chrome/browser/cocoa/page_info_window_controller.mm b/chrome/browser/cocoa/page_info_window_controller.mm
index 988f6b9..521ab68 100644
--- a/chrome/browser/cocoa/page_info_window_controller.mm
+++ b/chrome/browser/cocoa/page_info_window_controller.mm
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/page_info_window_controller.h"
 
-#include "app/resource_bundle.h"
+#include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ -12,25 +12,30 @@
 #include "chrome/browser/cocoa/window_size_autosaver.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/pref_names.h"
-#include "grit/theme_resources.h"
+#include "grit/generated_resources.h"
+
+namespace {
+
+// The width of the window. The height will be determined by the content.
+const NSInteger kWindowWidth = 460;
+
+}  // namespace
 
 @implementation PageInfoWindowController
-@synthesize identityImg = identityImg_;
-@synthesize connectionImg = connectionImg_;
-@synthesize historyImg = historyImg_;
-@synthesize identityMsg = identityMsg_;
-@synthesize connectionMsg = connectionMsg_;
-@synthesize historyMsg = historyMsg_;
-@synthesize enableCertButton = enableCertButton_;
 
 - (id)init {
-  NSBundle* bundle = mac_util::MainAppBundle();
-  NSString* nibpath = [bundle pathForResource:@"PageInfo" ofType:@"nib"];
-  if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
-    // Load the image refs.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    goodImg_.reset([rb.GetNSImageNamed(IDR_PAGEINFO_GOOD) retain]);
-    badImg_.reset([rb.GetNSImageNamed(IDR_PAGEINFO_BAD) retain]);
+  NSUInteger styleMask = NSTitledWindowMask | NSClosableWindowMask |
+                         NSMiniaturizableWindowMask;
+  scoped_nsobject<NSWindow> window(
+      // Use an arbitrary height because it will be changed by the bridge.
+      [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, kWindowWidth, 100)
+                                  styleMask:styleMask
+                                    backing:NSBackingStoreBuffered
+                                      defer:NO]);
+  if ((self = [super initWithWindow:window.get()])) {
+    [window setTitle:
+        l10n_util::GetNSStringWithFixup(IDS_PAGEINFO_WINDOW_TITLE)];
+    [window setDelegate:self];
 
     if (g_browser_process && g_browser_process->local_state()) {
       sizeSaver_.reset([[WindowSizeAutosaver alloc]
@@ -38,66 +43,19 @@
              prefService:g_browser_process->local_state()
                     path:prefs::kPageInfoWindowPlacement
                    state:kSaveWindowPos]);
-      // Cascade again to get the offset when opening new windows.
-      NSRect frame = [[self window] frame];
-      NSPoint cascadePoint = [[self window]
-          cascadeTopLeftFromPoint:NSMakePoint(NSMinX(frame), NSMaxY(frame))];
-      [[self window] cascadeTopLeftFromPoint:cascadePoint];
     }
   }
   return self;
 }
 
-- (void)awakeFromNib {
-  // By default, assume we have no history information.
-  [self setShowHistoryBox:NO];
-}
-
-- (void)dealloc {
-  [identityImg_ release];
-  [connectionImg_ release];
-  [historyImg_ release];
-  [identityMsg_ release];
-  [connectionMsg_ release];
-  [historyMsg_ release];
-  [super dealloc];
-}
-
 - (void)setPageInfo:(PageInfoWindowMac*)pageInfo {
   pageInfo_.reset(pageInfo);
 }
 
-- (NSImage*)goodImg {
-  return goodImg_.get();
-}
-
-- (NSImage*)badImg {
-  return badImg_.get();
-}
-
 - (IBAction)showCertWindow:(id)sender {
   pageInfo_->ShowCertDialog(0);  // Pass it any int because it's ignored.
 }
 
-- (void)setShowHistoryBox:(BOOL)show {
-  [historyBox_ setHidden:!show];
-
-  NSWindow* window = [self window];
-  NSRect frame = [window frame];
-
-  const NSSize kPageInfoWindowSize = NSMakeSize(460, 235);
-  const NSSize kPageInfoWindowWithHistorySize = NSMakeSize(460, 310);
-
-  NSSize size = (show ? kPageInfoWindowWithHistorySize : kPageInfoWindowSize);
-
-  // Just setting |size| will cause the window to grow upwards. Shift the
-  // origin up by grow amount, which causes the window to grow downwards.
-  frame.origin.y -= size.height - frame.size.height;
-  frame.size = size;
-
-  [window setFrame:frame display:YES animate:YES];
-}
-
 // If the page info window gets closed, we have nothing left to manage and we
 // can clean ourselves up.
 - (void)windowWillClose:(NSNotification*)notif {