From b01f7e19dbb8989e7f129c4f47e1a0d463e09a94 Mon Sep 17 00:00:00 2001 From: "merkulova@chromium.org" Date: Wed, 16 Oct 2013 13:02:51 +0000 Subject: Help-app (Learn more) dialog language-specific sizes set to avoid esxcess unused space. English spoken languages, ar, et, hi, sl, sk -- 710x400 px; Bg, de, el, es, fil, fr -- 730x410 px; Others -- 720x405 px. Title or page layout can't be changed as page-content doesn't belong to chrome itself. BUG=151277 NOTRY=true Review URL: https://codereview.chromium.org/27251004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228910 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/resources/locale_settings.grd | 12 +++++++++++- chrome/app/resources/locale_settings_am.xtb | 2 ++ chrome/app/resources/locale_settings_bg.xtb | 2 ++ chrome/app/resources/locale_settings_bn.xtb | 2 ++ chrome/app/resources/locale_settings_ca.xtb | 2 ++ chrome/app/resources/locale_settings_cs.xtb | 2 ++ chrome/app/resources/locale_settings_da.xtb | 2 ++ chrome/app/resources/locale_settings_de.xtb | 2 ++ chrome/app/resources/locale_settings_el.xtb | 2 ++ chrome/app/resources/locale_settings_es-419.xtb | 2 ++ chrome/app/resources/locale_settings_es.xtb | 2 ++ chrome/app/resources/locale_settings_et.xtb | 2 ++ chrome/app/resources/locale_settings_fa.xtb | 2 ++ chrome/app/resources/locale_settings_fake-bidi.xtb | 2 ++ chrome/app/resources/locale_settings_fi.xtb | 2 ++ chrome/app/resources/locale_settings_fil.xtb | 2 ++ chrome/app/resources/locale_settings_fr.xtb | 2 ++ chrome/app/resources/locale_settings_gu.xtb | 2 ++ chrome/app/resources/locale_settings_he.xtb | 2 ++ chrome/app/resources/locale_settings_hr.xtb | 2 ++ chrome/app/resources/locale_settings_hu.xtb | 2 ++ chrome/app/resources/locale_settings_id.xtb | 2 ++ chrome/app/resources/locale_settings_it.xtb | 2 ++ chrome/app/resources/locale_settings_ja.xtb | 2 ++ chrome/app/resources/locale_settings_kn.xtb | 2 ++ chrome/app/resources/locale_settings_ko.xtb | 2 ++ chrome/app/resources/locale_settings_lt.xtb | 2 ++ chrome/app/resources/locale_settings_lv.xtb | 2 ++ chrome/app/resources/locale_settings_ml.xtb | 2 ++ chrome/app/resources/locale_settings_mr.xtb | 2 ++ chrome/app/resources/locale_settings_ms.xtb | 2 ++ chrome/app/resources/locale_settings_nb.xtb | 2 ++ chrome/app/resources/locale_settings_nl.xtb | 2 ++ chrome/app/resources/locale_settings_pl.xtb | 2 ++ chrome/app/resources/locale_settings_pt-BR.xtb | 2 ++ chrome/app/resources/locale_settings_pt-PT.xtb | 2 ++ chrome/app/resources/locale_settings_ro.xtb | 2 ++ chrome/app/resources/locale_settings_ru.xtb | 2 ++ chrome/app/resources/locale_settings_sr.xtb | 2 ++ chrome/app/resources/locale_settings_sv.xtb | 2 ++ chrome/app/resources/locale_settings_ta.xtb | 2 ++ chrome/app/resources/locale_settings_te.xtb | 2 ++ chrome/app/resources/locale_settings_th.xtb | 2 ++ chrome/app/resources/locale_settings_tr.xtb | 2 ++ chrome/app/resources/locale_settings_vi.xtb | 2 ++ chrome/app/resources/locale_settings_zh-CN.xtb | 2 ++ chrome/app/resources/locale_settings_zh-TW.xtb | 2 ++ chrome/browser/chromeos/login/help_app_launcher.cc | 9 +++++++++ 48 files changed, 112 insertions(+), 1 deletion(-) diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 98f7e0c..ee3f981 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -420,7 +420,17 @@ 81 - + + + 710 + + + + + 400 + + + http://support.google.com/chromeos/bin/answer.py?answer=183084&hl=[GRITLANGCODE] diff --git a/chrome/app/resources/locale_settings_am.xtb b/chrome/app/resources/locale_settings_am.xtb index 8849dd4..c2e2fcb 100644 --- a/chrome/app/resources/locale_settings_am.xtb +++ b/chrome/app/resources/locale_settings_am.xtb @@ -62,4 +62,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb index a03052e..00ddeef 100644 --- a/chrome/app/resources/locale_settings_bg.xtb +++ b/chrome/app/resources/locale_settings_bg.xtb @@ -66,4 +66,6 @@ 26 23 110 +730 +410 diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb index 9adc1ff..9fe35dc 100644 --- a/chrome/app/resources/locale_settings_bn.xtb +++ b/chrome/app/resources/locale_settings_bn.xtb @@ -63,4 +63,6 @@ 67 4 20 +720 +405 diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb index 290d31e..b3ca4e5 100644 --- a/chrome/app/resources/locale_settings_ca.xtb +++ b/chrome/app/resources/locale_settings_ca.xtb @@ -65,4 +65,6 @@ 83 24 21 +720 +405 diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb index d7ea402..e4f41e6 100644 --- a/chrome/app/resources/locale_settings_cs.xtb +++ b/chrome/app/resources/locale_settings_cs.xtb @@ -67,4 +67,6 @@ 4 83 24 +720 +405 diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb index da3c609..976d032 100644 --- a/chrome/app/resources/locale_settings_da.xtb +++ b/chrome/app/resources/locale_settings_da.xtb @@ -62,4 +62,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb index 7c0bc66..c633206 100644 --- a/chrome/app/resources/locale_settings_de.xtb +++ b/chrome/app/resources/locale_settings_de.xtb @@ -69,4 +69,6 @@ 25 23 94 +730 +410 diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb index 1c8a1b7..aeea5d2 100644 --- a/chrome/app/resources/locale_settings_el.xtb +++ b/chrome/app/resources/locale_settings_el.xtb @@ -66,4 +66,6 @@ 26 98 24 +730 +410 diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb index d3bce51..c5c738d 100644 --- a/chrome/app/resources/locale_settings_es-419.xtb +++ b/chrome/app/resources/locale_settings_es-419.xtb @@ -67,4 +67,6 @@ 4 83 22 +730 +410 diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb index c237884..f68dc46 100644 --- a/chrome/app/resources/locale_settings_es.xtb +++ b/chrome/app/resources/locale_settings_es.xtb @@ -67,4 +67,6 @@ 72 4 84 +730 +410 diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb index d495342..167e69b 100644 --- a/chrome/app/resources/locale_settings_et.xtb +++ b/chrome/app/resources/locale_settings_et.xtb @@ -63,4 +63,6 @@ 67 4 25 +710 +400 diff --git a/chrome/app/resources/locale_settings_fa.xtb b/chrome/app/resources/locale_settings_fa.xtb index 34e625c..9a46e55 100644 --- a/chrome/app/resources/locale_settings_fa.xtb +++ b/chrome/app/resources/locale_settings_fa.xtb @@ -66,4 +66,6 @@ 25 22 96 +720 +405 diff --git a/chrome/app/resources/locale_settings_fake-bidi.xtb b/chrome/app/resources/locale_settings_fake-bidi.xtb index 3d24bcb..43878f9 100644 --- a/chrome/app/resources/locale_settings_fake-bidi.xtb +++ b/chrome/app/resources/locale_settings_fake-bidi.xtb @@ -62,4 +62,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb index f8d4e90..c33189a 100644 --- a/chrome/app/resources/locale_settings_fi.xtb +++ b/chrome/app/resources/locale_settings_fi.xtb @@ -63,4 +63,6 @@ 67 4 24 +720 +405 diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb index 4ee7fe7..f04ebcf 100644 --- a/chrome/app/resources/locale_settings_fil.xtb +++ b/chrome/app/resources/locale_settings_fil.xtb @@ -65,4 +65,6 @@ 83 27 92 +730 +410 diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb index 6331a49..eacca4c 100644 --- a/chrome/app/resources/locale_settings_fr.xtb +++ b/chrome/app/resources/locale_settings_fr.xtb @@ -68,4 +68,6 @@ 4 83 26 +730 +410 diff --git a/chrome/app/resources/locale_settings_gu.xtb b/chrome/app/resources/locale_settings_gu.xtb index 31e53aa..0048954 100644 --- a/chrome/app/resources/locale_settings_gu.xtb +++ b/chrome/app/resources/locale_settings_gu.xtb @@ -62,4 +62,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb index 206dccd..70be445 100644 --- a/chrome/app/resources/locale_settings_he.xtb +++ b/chrome/app/resources/locale_settings_he.xtb @@ -62,4 +62,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb index 52432fb..1292957 100644 --- a/chrome/app/resources/locale_settings_hr.xtb +++ b/chrome/app/resources/locale_settings_hr.xtb @@ -63,4 +63,6 @@ 4 25 84 +720 +405 diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb index b2ce0457f..22767d63 100644 --- a/chrome/app/resources/locale_settings_hu.xtb +++ b/chrome/app/resources/locale_settings_hu.xtb @@ -64,4 +64,6 @@ 25 19 100 +720 +405 diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb index 048474f..ef01669 100644 --- a/chrome/app/resources/locale_settings_id.xtb +++ b/chrome/app/resources/locale_settings_id.xtb @@ -62,4 +62,6 @@ 67 4 25 +720 +405 diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb index a1d0543..653923e 100644 --- a/chrome/app/resources/locale_settings_it.xtb +++ b/chrome/app/resources/locale_settings_it.xtb @@ -64,4 +64,6 @@ 8 72 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb index a42185b..e7e18df 100644 --- a/chrome/app/resources/locale_settings_ja.xtb +++ b/chrome/app/resources/locale_settings_ja.xtb @@ -65,4 +65,6 @@ 72 4 82 +720 +405 diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb index cd348fc..cce3145 100644 --- a/chrome/app/resources/locale_settings_kn.xtb +++ b/chrome/app/resources/locale_settings_kn.xtb @@ -61,4 +61,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb index e3fd49a..dbdc265 100644 --- a/chrome/app/resources/locale_settings_ko.xtb +++ b/chrome/app/resources/locale_settings_ko.xtb @@ -68,4 +68,6 @@ 8 72 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb index 42fea1d..45ff215 100644 --- a/chrome/app/resources/locale_settings_lt.xtb +++ b/chrome/app/resources/locale_settings_lt.xtb @@ -64,4 +64,6 @@ 82 25 19 +720 +405 diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb index 1a1a3ef..f376107 100644 --- a/chrome/app/resources/locale_settings_lv.xtb +++ b/chrome/app/resources/locale_settings_lv.xtb @@ -61,4 +61,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb index 4a90944..c59d923 100644 --- a/chrome/app/resources/locale_settings_ml.xtb +++ b/chrome/app/resources/locale_settings_ml.xtb @@ -64,4 +64,6 @@ 88 26 30 +720 +405 diff --git a/chrome/app/resources/locale_settings_mr.xtb b/chrome/app/resources/locale_settings_mr.xtb index 5aa9d0e..58434dc 100644 --- a/chrome/app/resources/locale_settings_mr.xtb +++ b/chrome/app/resources/locale_settings_mr.xtb @@ -61,4 +61,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_ms.xtb b/chrome/app/resources/locale_settings_ms.xtb index 7a0585a..e76206b 100644 --- a/chrome/app/resources/locale_settings_ms.xtb +++ b/chrome/app/resources/locale_settings_ms.xtb @@ -2,4 +2,6 @@ 350 +720 +405 \ No newline at end of file diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb index 9f33a36..809f077 100644 --- a/chrome/app/resources/locale_settings_nb.xtb +++ b/chrome/app/resources/locale_settings_nb.xtb @@ -64,4 +64,6 @@ 84 25 21 +720 +405 diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb index f075e70..4d78704 100644 --- a/chrome/app/resources/locale_settings_nl.xtb +++ b/chrome/app/resources/locale_settings_nl.xtb @@ -68,4 +68,6 @@ 97 84 21 +720 +405 diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb index c36c109..b9dc743 100644 --- a/chrome/app/resources/locale_settings_pl.xtb +++ b/chrome/app/resources/locale_settings_pl.xtb @@ -66,4 +66,6 @@ 4 25 22 +720 +405 diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb index 4080d28..2894362 100644 --- a/chrome/app/resources/locale_settings_pt-BR.xtb +++ b/chrome/app/resources/locale_settings_pt-BR.xtb @@ -65,4 +65,6 @@ 72 4 84 +720 +405 diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb index b4b4a3b..a020999 100644 --- a/chrome/app/resources/locale_settings_pt-PT.xtb +++ b/chrome/app/resources/locale_settings_pt-PT.xtb @@ -65,4 +65,6 @@ 67 4 82 +720 +405 diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb index b77ea78..8d86da6 100644 --- a/chrome/app/resources/locale_settings_ro.xtb +++ b/chrome/app/resources/locale_settings_ro.xtb @@ -64,4 +64,6 @@ 26 80 23 +720 +405 diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb index f5cf807..0e67efe 100644 --- a/chrome/app/resources/locale_settings_ru.xtb +++ b/chrome/app/resources/locale_settings_ru.xtb @@ -68,4 +68,6 @@ 25 27 94 +720 +405 diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb index 3dc1f38..374a72a 100644 --- a/chrome/app/resources/locale_settings_sr.xtb +++ b/chrome/app/resources/locale_settings_sr.xtb @@ -64,4 +64,6 @@ 25 84 20 +720 +405 diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb index e03f377..1bd5874 100644 --- a/chrome/app/resources/locale_settings_sv.xtb +++ b/chrome/app/resources/locale_settings_sv.xtb @@ -64,4 +64,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb index 86b846c..012cc20 100644 --- a/chrome/app/resources/locale_settings_ta.xtb +++ b/chrome/app/resources/locale_settings_ta.xtb @@ -64,4 +64,6 @@ 83 26 23 +720 +405 diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb index f10e7f2..eec5263 100644 --- a/chrome/app/resources/locale_settings_te.xtb +++ b/chrome/app/resources/locale_settings_te.xtb @@ -61,4 +61,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb index ad1d9ea..f109779 100644 --- a/chrome/app/resources/locale_settings_th.xtb +++ b/chrome/app/resources/locale_settings_th.xtb @@ -61,4 +61,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb index 22ef3a4..19f9521 100644 --- a/chrome/app/resources/locale_settings_tr.xtb +++ b/chrome/app/resources/locale_settings_tr.xtb @@ -64,4 +64,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb index d87dd04..5692da2 100644 --- a/chrome/app/resources/locale_settings_vi.xtb +++ b/chrome/app/resources/locale_settings_vi.xtb @@ -62,4 +62,6 @@ 67 4 25 +720 +405 diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb index 8841ab7..76f0189 100644 --- a/chrome/app/resources/locale_settings_zh-CN.xtb +++ b/chrome/app/resources/locale_settings_zh-CN.xtb @@ -64,4 +64,6 @@ 8 67 4 +720 +405 diff --git a/chrome/app/resources/locale_settings_zh-TW.xtb b/chrome/app/resources/locale_settings_zh-TW.xtb index 9720a9e..57f872c 100644 --- a/chrome/app/resources/locale_settings_zh-TW.xtb +++ b/chrome/app/resources/locale_settings_zh-TW.xtb @@ -64,4 +64,6 @@ 8 67 4 +720 +405 diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc index 9383f79..8a58db6 100644 --- a/chrome/browser/chromeos/login/help_app_launcher.cc +++ b/chrome/browser/chromeos/login/help_app_launcher.cc @@ -8,12 +8,16 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" using content::BrowserThread; @@ -66,6 +70,11 @@ void HelpAppLauncher::ShowHelpTopicDialog(const GURL& topic_url) { l10n_util::GetStringUTF16(IDS_LOGIN_OOBE_HELP_DIALOG_TITLE), topic_url, LoginWebDialog::STYLE_BUBBLE); + gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size())); + dialog->SetDialogSize(l10n_util::GetLocalizedContentsWidthInPixels( + IDS_HELP_APP_DIALOG_WIDTH_PIXELS), + l10n_util::GetLocalizedContentsWidthInPixels( + IDS_HELP_APP_DIALOG_HEIGHT_PIXELS)); dialog->Show(); // The dialog object will be deleted on dialog close. } -- cgit v1.1