| 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
|
|
|
|
|