Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3084)

Unified Diff: chrome/browser/ui/cocoa/hung_renderer_controller.mm

Issue 1107273002: Use the new ICU plural syntax to fix the strings in the hung pages dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: grd descriptions Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/hung_renderer_controller.h ('k') | chrome/browser/ui/views/hung_renderer_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/hung_renderer_controller.mm
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index a3c5b90a3f0a157aa11e33977a2229a6197ffccb..41aa619201765a8a1dabbe0c6c1556d94c782b2e 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -14,6 +14,7 @@
#include "chrome/browser/ui/tab_contents/core_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
#include "chrome/common/logging_chrome.h"
+#include "chrome/grit/generated_resources.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
@@ -27,6 +28,29 @@
using content::WebContents;
+@interface HungRendererController ()
+
+// Lays out the interface for the specified number of items.
+- (void)layoutForItemCount:(int)count;
+
+// Modifies the dialog to show a warning for the given tab contents.
+// The dialog will contain a list of all tabs that share a renderer
+// process with |contents|. The caller must not delete any tab
+// contents without first calling endForWebContents.
+- (void)showForWebContents:(content::WebContents*)contents;
+
+// Notifies the dialog that |contents| is either responsive or closed.
+// If |contents| shares the same render process as the tab contents
+// this dialog was created for, this function will close the dialog.
+// If |contents| has a different process, this function does nothing.
+- (void)endForWebContents:(content::WebContents*)contents;
+
+// Called by |hungContentsObserver_| to indicate that |hungContents_|
+// has gone away.
+- (void)renderProcessGone;
+
+@end
+
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.
@@ -77,12 +101,28 @@ class HungRendererWebContentsObserverBridge
}
- (void)awakeFromNib {
- // Load in the image
+ // Load in the image.
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
NSImage* backgroundImage =
rb.GetNativeImageNamed(IDR_FROZEN_TAB_ICON).ToNSImage();
[imageView_ setImage:backgroundImage];
+ // Make the "wait" button respond to additional keys. By setting this to
+ // @"\e", it will respond to both Esc and Command-. (period).
+ KeyEquivalentAndModifierMask key;
+ key.charCode = @"\e";
+ [waitButton_ addKeyEquivalent:key];
+}
+
+- (void)layoutForItemCount:(int)count {
+ // Set the messages.
+ [[self window] setTitle:
+ l10n_util::GetPluralNSStringF(IDS_BROWSER_HANGMONITOR_RENDERER_TITLE,
+ count)];
+ [messageView_ setStringValue:
+ l10n_util::GetPluralNSStringF(IDS_BROWSER_HANGMONITOR_RENDERER,
+ count)];
+
// Make the message fit.
CGFloat messageShift =
[GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:messageView_];
@@ -97,12 +137,6 @@ class HungRendererWebContentsObserverBridge
[GTMUILocalizerAndLayoutTweaker
resizeWindowWithoutAutoResizingSubViews:[self window]
delta:windowDelta];
-
- // Make the "wait" button respond to additional keys. By setting this to
- // @"\e", it will respond to both Esc and Command-. (period).
- KeyEquivalentAndModifierMask key;
- key.charCode = @"\e";
- [waitButton_ addKeyEquivalent:key];
}
+ (void)showForWebContents:(content::WebContents*)contents {
@@ -201,6 +235,7 @@ class HungRendererWebContentsObserverBridge
hungFavicons_.reset([favicons copy]);
[tableView_ reloadData];
+ [self layoutForItemCount:[titles count]];
[[self window] center];
[self showWindow:self];
}
« no previous file with comments | « chrome/browser/ui/cocoa/hung_renderer_controller.h ('k') | chrome/browser/ui/views/hung_renderer_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698