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

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

Issue 140323005: Truncate the Javascript alert message if the length is too long on Mac port (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use TruncateString Created 6 years, 11 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 | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
index 7341835b372e3527306b29bcf4a07474317b3d93..a60703b4d0c6a43b0d5d7f5e754056af3cdc40a6 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -16,6 +16,10 @@
#include "grit/ui_strings.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/ui_base_types.h"
+#include "ui/gfx/text_elider.h"
+
+const int kSlotsPerLine = 50;
+const int kMessageTextMaxSlots = 2000;
// Helper object that receives the notification that the dialog/sheet is
// going away. Is responsible for cleaning itself up.
@@ -146,6 +150,24 @@ JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa(
[alert_ setDelegate:helper_];
NSString* informative_text =
base::SysUTF16ToNSString(dialog_->message_text());
+
+ // Truncate long JS alerts - crbug.com/331219
+ NSCharacterSet* newline_char_set = [NSCharacterSet newlineCharacterSet];
+ for (size_t index = 0, slots_count = 0; index < informative_text.length;
+ ++index) {
+ unichar current_char = [informative_text characterAtIndex:index];
+ if ([newline_char_set characterIsMember:current_char])
+ slots_count += kSlotsPerLine;
+ else
+ slots_count++;
+ if (slots_count > kMessageTextMaxSlots) {
+ base::string16 info_text = base::SysNSStringToUTF16(informative_text);
+ informative_text = base::SysUTF16ToNSString(
+ gfx::TruncateString(info_text, index));
+ break;
+ }
+ }
+
[alert_ setInformativeText:informative_text];
NSString* message_text =
base::SysUTF16ToNSString(dialog_->title());
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698