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

Unified Diff: components/app_modal/javascript_app_modal_dialog.cc

Issue 1711863004: Restrict JavaScript dialogs to 100 characters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better approach Created 4 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/app_modal/javascript_app_modal_dialog.cc
diff --git a/components/app_modal/javascript_app_modal_dialog.cc b/components/app_modal/javascript_app_modal_dialog.cc
index 26d1b03801def4b44ff6571fb709dd4257607749..92a1a38e07630ee10d292da67fae3d19a409ff2b 100644
--- a/components/app_modal/javascript_app_modal_dialog.cc
+++ b/components/app_modal/javascript_app_modal_dialog.cc
@@ -16,30 +16,10 @@
namespace app_modal {
namespace {
-// Control maximum sizes of various texts passed to us from javascript.
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-// Two-dimensional eliding. Reformat the text of the message dialog
-// inserting line breaks because otherwise a single long line can overflow
-// the message dialog (and crash/hang the GTK, depending on the version).
-const int kMessageTextMaxRows = 32;
-const int kMessageTextMaxCols = 132;
-const int kDefaultPromptMaxRows = 24;
-const int kDefaultPromptMaxCols = 132;
-void EnforceMaxTextSize(const base::string16& in_string,
- base::string16* out_string) {
- gfx::ElideRectangleString(in_string, kMessageTextMaxRows,
- kMessageTextMaxCols, false, out_string);
-}
-void EnforceMaxPromptSize(const base::string16& in_string,
- base::string16* out_string) {
- gfx::ElideRectangleString(in_string, kDefaultPromptMaxRows,
- kDefaultPromptMaxCols, false, out_string);
-}
-#else
// One-dimensional eliding. Trust the window system to break the string
// appropriately, but limit its overall length to something reasonable.
-const size_t kMessageTextMaxSize = 2000;
-const size_t kDefaultPromptMaxSize = 2000;
+const size_t kMessageTextMaxSize = 100;
+const size_t kDefaultPromptMaxSize = 50;
void EnforceMaxTextSize(const base::string16& in_string,
base::string16* out_string) {
gfx::ElideString(in_string, kMessageTextMaxSize, out_string);
@@ -48,7 +28,6 @@ void EnforceMaxPromptSize(const base::string16& in_string,
base::string16* out_string) {
gfx::ElideString(in_string, kDefaultPromptMaxSize, out_string);
}
-#endif
} // namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698