Hung Renderer dialog:...

chrome/browser/cocoa/hung_renderer_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
-#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/process_util.h"
 #include "base/sys_string_conversions.h"
-#include "grit/generated_resources.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/hung_renderer_dialog.h"
 #import "chrome/browser/cocoa/hung_renderer_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
 #include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 namespace {
 // We only support showing one of these at a time per app.  The
 // controller owns itself and is released when its window is closed.
 HungRendererController* g_instance = NULL;
 }  // end namespace
 
 @implementation HungRendererController
 
 - (id)initWithWindowNibName:(NSString*)nibName {
   NSString* nibpath = [mac_util::MainAppBundle() pathForResource:nibName
                                                           ofType:@"nib"];
   self = [super initWithWindowNibPath:nibpath owner:self];
   if (self) {
     [tableView_ setDataSource:self];
   }
   return self;
 }
 
 - (void)dealloc {
   DCHECK(!g_instance);
   [super dealloc];
 }
 
 - (void)awakeFromNib {
-  // This is easier than creating a localizer, since we only have one
-  // string to modify.
-  std::wstring productString = l10n_util::GetString(IDS_PRODUCT_NAME);
-  [[self window] setTitle:base::SysWideToNSString(productString)];
+  // Load in the image
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  NSImage* backgroundImage = rb.GetNSImageNamed(IDR_FROZEN_TAB_ICON);
+  DCHECK(backgroundImage);
+  [imageView_ setImage:backgroundImage];
+
+  // Make the message fit.
+  CGFloat messageShift =
+    [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:messageView_];
+
+  // Move the graphic up to be top even with the message.
+  NSRect graphicFrame = [imageView_ frame];
+  graphicFrame.origin.y += messageShift;
+  [imageView_ setFrame:graphicFrame];
+
+  // Make the window taller to fit everything.
+  NSWindow* window = [self window];
+  [[window contentView] setAutoresizesSubviews:NO];
+  NSRect windowFrame = [window frame];
+  windowFrame.size.height += messageShift;
+  [window setFrame:windowFrame display:NO];
+  [[window contentView] setAutoresizesSubviews:YES];
 }
 
 - (IBAction)kill:(id)sender {
   if (hungContents_)
     base::KillProcess(hungContents_->process()->process().handle(),
                       ResultCodes::HUNG, false);
   // Cannot call performClose:, because the close button is disabled.
   [self close];
 }
 
 - (IBAction)wait:(id)sender {
   if (hungContents_ && hungContents_->render_view_host())
     hungContents_->render_view_host()->RestartHangMonitorTimeout();
   // Cannot call performClose:, because the close button is disabled.
   [self close];
 }
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView {
   return hungRenderers_.size();
 }
 
 - (id)tableView:(NSTableView*)aTableView
       objectValueForTableColumn:(NSTableColumn*)column
             row:(int)rowIndex {
   // TODO(rohitrao): Add favicons.
   TabContents* contents = hungRenderers_[rowIndex];
   string16 title = contents->GetTitle();
-  if (title.empty())
-    title = l10n_util::GetStringUTF16(IDS_TAB_UNTITLED_TITLE);
-  return base::SysUTF16ToNSString(title);
+  if (!title.empty())
+    return base::SysUTF16ToNSString(title);
+  return l10n_util::GetNSStringWithFixup(IDS_TAB_UNTITLED_TITLE);
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   // We have to reset g_instance before autoreleasing the window,
   // because we want to avoid reusing the same dialog if someone calls
   // HungRendererDialog::ShowForTabContents() between the autorelease
   // call and the actual dealloc.
   g_instance = nil;
 
   [self autorelease];
@@ skipping 42 matching lines @@
                      initWithWindowNibName:@"HungRendererDialog"];
     [g_instance showForTabContents:contents];
   }
 }
 
 // static
 void HungRendererDialog::HideForTabContents(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     [g_instance endForTabContents:contents];
 }