diff options
54 files changed, 194 insertions, 72 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 1852491..8a5616b 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -659,6 +659,13 @@ <message name="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES" use_name_for_id="true"> 25 </message> + + <message name="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS" use_name_for_id="true"> + 50 + </message> + <message name="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES" use_name_for_id="true"> + 5 + </message> </messages> </release> diff --git a/chrome/app/resources/locale_settings_ar.xtb b/chrome/app/resources/locale_settings_ar.xtb index 8cd741d..f4b4642 100644 --- a/chrome/app/resources/locale_settings_ar.xtb +++ b/chrome/app/resources/locale_settings_ar.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb index cec03ab..2d43e77 100644 --- a/chrome/app/resources/locale_settings_bg.xtb +++ b/chrome/app/resources/locale_settings_bg.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb index 80cbdcf..fbec09f 100644 --- a/chrome/app/resources/locale_settings_bn.xtb +++ b/chrome/app/resources/locale_settings_bn.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb index 90db1b9..bde8783 100644 --- a/chrome/app/resources/locale_settings_ca.xtb +++ b/chrome/app/resources/locale_settings_ca.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb index 1a30e6a..7859f4b 100644 --- a/chrome/app/resources/locale_settings_cs.xtb +++ b/chrome/app/resources/locale_settings_cs.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb index 3216e45..ad70ac2 100644 --- a/chrome/app/resources/locale_settings_da.xtb +++ b/chrome/app/resources/locale_settings_da.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb index d0b3f45..e4f9146 100644 --- a/chrome/app/resources/locale_settings_de.xtb +++ b/chrome/app/resources/locale_settings_de.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb index a8a5149..827eba3 100644 --- a/chrome/app/resources/locale_settings_el.xtb +++ b/chrome/app/resources/locale_settings_el.xtb @@ -57,9 +57,7 @@ <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">120</translation> <translation id="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">12</translation> <translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_WIDTH_CHARS">70</translation> - <translation id="IDS_FIRSTRUNOEMBUBBLE_DIALOG_HEIGHT_LINES">4</translation> - <translation id="IDS_STATIC_ENCODING_LIST">ISO-8859-7,windows-1253</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">150</translation> <translation id="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">40</translation> @@ -69,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_en-GB.xtb b/chrome/app/resources/locale_settings_en-GB.xtb index 622b116..73e9e1f 100644 --- a/chrome/app/resources/locale_settings_en-GB.xtb +++ b/chrome/app/resources/locale_settings_en-GB.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb index 30b6b5b..b6ba100 100644 --- a/chrome/app/resources/locale_settings_es-419.xtb +++ b/chrome/app/resources/locale_settings_es-419.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb index 137afc4..e784ae7 100644 --- a/chrome/app/resources/locale_settings_es.xtb +++ b/chrome/app/resources/locale_settings_es.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb index 85f83eb..fc53fe6 100644 --- a/chrome/app/resources/locale_settings_et.xtb +++ b/chrome/app/resources/locale_settings_et.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb index 9cf37ae..927d2c7 100644 --- a/chrome/app/resources/locale_settings_fi.xtb +++ b/chrome/app/resources/locale_settings_fi.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb index cca45f8..9bc14e6 100644 --- a/chrome/app/resources/locale_settings_fil.xtb +++ b/chrome/app/resources/locale_settings_fil.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb index 77d2616..d68f2e5 100644 --- a/chrome/app/resources/locale_settings_fr.xtb +++ b/chrome/app/resources/locale_settings_fr.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_gu.xtb b/chrome/app/resources/locale_settings_gu.xtb index bfc25b2..4ec86c8 100644 --- a/chrome/app/resources/locale_settings_gu.xtb +++ b/chrome/app/resources/locale_settings_gu.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb index dda14b0..4730869 100644 --- a/chrome/app/resources/locale_settings_he.xtb +++ b/chrome/app/resources/locale_settings_he.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_hi.xtb b/chrome/app/resources/locale_settings_hi.xtb index eae37b7..9cfb43f 100644 --- a/chrome/app/resources/locale_settings_hi.xtb +++ b/chrome/app/resources/locale_settings_hi.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb index ac95893..5b7faed 100644 --- a/chrome/app/resources/locale_settings_hr.xtb +++ b/chrome/app/resources/locale_settings_hr.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb index 992edf7..c4203ac 100644 --- a/chrome/app/resources/locale_settings_hu.xtb +++ b/chrome/app/resources/locale_settings_hu.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb index 0699a72..e61d4e0 100644 --- a/chrome/app/resources/locale_settings_id.xtb +++ b/chrome/app/resources/locale_settings_id.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb index 3c73aa4..41e992f 100644 --- a/chrome/app/resources/locale_settings_it.xtb +++ b/chrome/app/resources/locale_settings_it.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb index f72229c..510954e 100644 --- a/chrome/app/resources/locale_settings_ja.xtb +++ b/chrome/app/resources/locale_settings_ja.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb index 79b3cd9..05a0fb3 100644 --- a/chrome/app/resources/locale_settings_kn.xtb +++ b/chrome/app/resources/locale_settings_kn.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb index f81976d..2a82300 100644 --- a/chrome/app/resources/locale_settings_ko.xtb +++ b/chrome/app/resources/locale_settings_ko.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb index f8c626f..e31cb91 100644 --- a/chrome/app/resources/locale_settings_lt.xtb +++ b/chrome/app/resources/locale_settings_lt.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb index e0f88bf..4a8e521 100644 --- a/chrome/app/resources/locale_settings_lv.xtb +++ b/chrome/app/resources/locale_settings_lv.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb index 24cd232..bbef046 100644 --- a/chrome/app/resources/locale_settings_ml.xtb +++ b/chrome/app/resources/locale_settings_ml.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_mr.xtb b/chrome/app/resources/locale_settings_mr.xtb index 9fd84a5..5d56e87 100644 --- a/chrome/app/resources/locale_settings_mr.xtb +++ b/chrome/app/resources/locale_settings_mr.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb index 91df33e..d388495 100644 --- a/chrome/app/resources/locale_settings_nb.xtb +++ b/chrome/app/resources/locale_settings_nb.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb index c11ff51..387609ee 100644 --- a/chrome/app/resources/locale_settings_nl.xtb +++ b/chrome/app/resources/locale_settings_nl.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_or.xtb b/chrome/app/resources/locale_settings_or.xtb index 679e7cc..21df7a3 100644 --- a/chrome/app/resources/locale_settings_or.xtb +++ b/chrome/app/resources/locale_settings_or.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb index d089515..73a6746 100644 --- a/chrome/app/resources/locale_settings_pl.xtb +++ b/chrome/app/resources/locale_settings_pl.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb index b72f8a9..4ef00b7 100644 --- a/chrome/app/resources/locale_settings_pt-BR.xtb +++ b/chrome/app/resources/locale_settings_pt-BR.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb index 5753718..1cdac3d 100644 --- a/chrome/app/resources/locale_settings_pt-PT.xtb +++ b/chrome/app/resources/locale_settings_pt-PT.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb index 1bbe5c8..c6a1202 100644 --- a/chrome/app/resources/locale_settings_ro.xtb +++ b/chrome/app/resources/locale_settings_ro.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb index 7215625..2d8bc2c 100644 --- a/chrome/app/resources/locale_settings_ru.xtb +++ b/chrome/app/resources/locale_settings_ru.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb index 874c518..5976078 100644 --- a/chrome/app/resources/locale_settings_sk.xtb +++ b/chrome/app/resources/locale_settings_sk.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sl.xtb b/chrome/app/resources/locale_settings_sl.xtb index 2479e29..8aed8b4 100644 --- a/chrome/app/resources/locale_settings_sl.xtb +++ b/chrome/app/resources/locale_settings_sl.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb index 7fded31..4a07f91 100644 --- a/chrome/app/resources/locale_settings_sr.xtb +++ b/chrome/app/resources/locale_settings_sr.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb index b70c52f..b9e58ab 100644 --- a/chrome/app/resources/locale_settings_sv.xtb +++ b/chrome/app/resources/locale_settings_sv.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb index df8cb81..1054cf54 100644 --- a/chrome/app/resources/locale_settings_ta.xtb +++ b/chrome/app/resources/locale_settings_ta.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb index 4d8d45a..d5c55a3 100644 --- a/chrome/app/resources/locale_settings_te.xtb +++ b/chrome/app/resources/locale_settings_te.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb index d678e61..67034bd 100644 --- a/chrome/app/resources/locale_settings_th.xtb +++ b/chrome/app/resources/locale_settings_th.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb index 2d8cfa7..bce37d1 100644 --- a/chrome/app/resources/locale_settings_tr.xtb +++ b/chrome/app/resources/locale_settings_tr.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb index c528fcd..579ce6d 100644 --- a/chrome/app/resources/locale_settings_uk.xtb +++ b/chrome/app/resources/locale_settings_uk.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb index 409664e..839c99d 100644 --- a/chrome/app/resources/locale_settings_vi.xtb +++ b/chrome/app/resources/locale_settings_vi.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb index b7b2b4e..2120efc 100644 --- a/chrome/app/resources/locale_settings_zh-CN.xtb +++ b/chrome/app/resources/locale_settings_zh-CN.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/app/resources/locale_settings_zh-TW.xtb b/chrome/app/resources/locale_settings_zh-TW.xtb index 89ebd5a..c3fe3cf 100644 --- a/chrome/app/resources/locale_settings_zh-TW.xtb +++ b/chrome/app/resources/locale_settings_zh-TW.xtb @@ -67,4 +67,6 @@ <translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation> <translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">45</translation> <translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">25</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation> +<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation> </translationbundle> diff --git a/chrome/browser/views/confirm_message_box_dialog.cc b/chrome/browser/views/confirm_message_box_dialog.cc index dd8cbd1..fe66582 100644 --- a/chrome/browser/views/confirm_message_box_dialog.cc +++ b/chrome/browser/views/confirm_message_box_dialog.cc @@ -6,39 +6,45 @@ #include "app/l10n_util.h" #include "app/message_box_flags.h" -#include "base/message_loop.h" #include "grit/generated_resources.h" -#include "views/controls/message_box_view.h" +#include "grit/locale_settings.h" +#include "views/standard_layout.h" #include "views/widget/widget.h" #include "views/window/window.h" // static -bool ConfirmMessageBoxDialog::Run(gfx::NativeWindow parent, +void ConfirmMessageBoxDialog::Run(gfx::NativeWindow parent, + ConfirmMessageBoxObserver* observer, const std::wstring& message_text, const std::wstring& window_title) { - ConfirmMessageBoxDialog* dialog = new ConfirmMessageBoxDialog(parent, - message_text, window_title); - MessageLoopForUI::current()->Run(dialog); - return dialog->accepted(); + DCHECK(observer); + ConfirmMessageBoxDialog* dialog = new ConfirmMessageBoxDialog(observer, + message_text, window_title); + views::Window* window = views::Window::CreateChromeWindow( + parent, gfx::Rect(), dialog); + window->Show(); } -ConfirmMessageBoxDialog::ConfirmMessageBoxDialog(gfx::NativeWindow parent, - const std::wstring& message_text, +ConfirmMessageBoxDialog::ConfirmMessageBoxDialog( + ConfirmMessageBoxObserver* observer, const std::wstring& message_text, const std::wstring& window_title) - : message_text_(message_text), - window_title_(window_title), - accepted_(false), - is_blocking_(true) { - message_box_view_ = new MessageBoxView(MessageBoxFlags::kIsConfirmMessageBox, - message_text_, window_title_); - views::Window::CreateChromeWindow(parent, gfx::Rect(), this)->Show(); -} - -ConfirmMessageBoxDialog::~ConfirmMessageBoxDialog() { -} - -void ConfirmMessageBoxDialog::DeleteDelegate() { - delete this; + : observer_(observer), + window_title_(window_title) { + message_label_ = new views::Label(message_text); + message_label_->SetMultiLine(true); + l10n_util::TextDirection direction = + l10n_util::GetFirstStrongCharacterDirection(message_label_->GetText()); + views::Label::Alignment alignment; + if (direction == l10n_util::RIGHT_TO_LEFT) + alignment = views::Label::ALIGN_RIGHT; + else + alignment = views::Label::ALIGN_LEFT; + // In addition, we should set the RTL alignment mode as + // AUTO_DETECT_ALIGNMENT so that the alignment will not be flipped around + // in RTL locales. + message_label_->SetRTLAlignmentMode(views::Label::AUTO_DETECT_ALIGNMENT); + message_label_->SetHorizontalAlignment(alignment); + AddChildView(message_label_); } int ConfirmMessageBoxDialog::GetDialogButtons() const { @@ -60,24 +66,25 @@ std::wstring ConfirmMessageBoxDialog::GetDialogButtonLabel( return DialogDelegate::GetDialogButtonLabel(button); } -views::View* ConfirmMessageBoxDialog::GetContentsView() { - return message_box_view_; -} - bool ConfirmMessageBoxDialog::Accept() { - is_blocking_ = false; - accepted_ = true; - return true; + observer_->OnConfirmMessageAccept(); + return true; // Dialog may now be closed. } bool ConfirmMessageBoxDialog::Cancel() { - is_blocking_ = false; - accepted_ = false; - return true; + observer_->OnConfirmMessageCancel(); + return true; // Dialog may now be closed. } -bool ConfirmMessageBoxDialog::Dispatch(const MSG& msg) { - TranslateMessage(&msg); - DispatchMessage(&msg); - return is_blocking_; +void ConfirmMessageBoxDialog::Layout() { + gfx::Size sz = message_label_->GetPreferredSize(); + message_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin, + width() - 2 * kPanelHorizMargin, + sz.height()); } + +gfx::Size ConfirmMessageBoxDialog::GetPreferredSize() { + return gfx::Size(views::Window::GetLocalizedContentsSize( + IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS, + IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES)); +}
\ No newline at end of file diff --git a/chrome/browser/views/confirm_message_box_dialog.h b/chrome/browser/views/confirm_message_box_dialog.h index 6792601..9b27536 100644 --- a/chrome/browser/views/confirm_message_box_dialog.h +++ b/chrome/browser/views/confirm_message_box_dialog.h @@ -9,24 +9,38 @@ #include "base/basictypes.h" #include "base/gfx/native_widget_types.h" -#include "base/message_loop.h" +#include "views/controls/label.h" #include "views/window/dialog_delegate.h" -class MessageBoxView; +// An interface the confirm dialog uses to notify its clients (observers) when +// the user makes a decision to confirm or cancel. Only one method will be +// invoked per use (i.e per invocation of ConfirmMessageBoxDialog::Run). +class ConfirmMessageBoxObserver { + public: + // The user explicitly confirmed by clicking "OK". + virtual void OnConfirmMessageAccept() = 0; + // The user chose not to confirm either by clicking "Cancel" or by closing + // the dialog. + virtual void OnConfirmMessageCancel() {} +}; class ConfirmMessageBoxDialog : public views::DialogDelegate, - public MessageLoopForUI::Dispatcher { + public views::View { public: - // The method blocks while the dialog is showing, and returns the the value - // of the user choice, if the user click in Yes button it returns true, - // otherwise false - static bool Run(gfx::NativeWindow parent, + // The method presents a modal confirmation dialog to the user with the title + // |window_title| and message |message_text|. |observer| will be notified + // when the user makes a decision or closes the dialog. Note that this class + // guarantees it will call one of the observer's methods, so it is the + // caller's responsibility to ensure |observer| lives until one of the + // methods is invoked; it can be deleted thereafter from this class' point + // of view. |parent| specifies where to insert the view into the hierarchy + // and effectively assumes ownership of the dialog. + static void Run(gfx::NativeWindow parent, + ConfirmMessageBoxObserver* observer, const std::wstring& message_text, const std::wstring& window_title); - virtual ~ConfirmMessageBoxDialog(); - - bool accepted() const { return accepted_; } + virtual ~ConfirmMessageBoxDialog() {} // views::DialogDelegate implementation. virtual int GetDialogButtons() const; @@ -38,31 +52,25 @@ class ConfirmMessageBoxDialog : public views::DialogDelegate, // views::WindowDelegate implementation. virtual bool IsModal() const { return true; } - virtual views::View* GetContentsView(); - virtual void DeleteDelegate(); + virtual views::View* GetContentsView() { return this; } - // MessageLoop::Dispatcher implementation. - virtual bool Dispatch(const MSG& msg); + // views::View implementation. + virtual void Layout(); + virtual gfx::Size GetPreferredSize(); private: - ConfirmMessageBoxDialog(gfx::NativeWindow parent, + ConfirmMessageBoxDialog(ConfirmMessageBoxObserver* observer, const std::wstring& message_text, const std::wstring& window_title); // The message which will be shown to user. - std::wstring message_text_; + views::Label* message_label_; // This is the Title bar text. std::wstring window_title_; - MessageBoxView* message_box_view_; - - // Returns true if the user clicks in Yes button, otherwise false - bool accepted_; - - // Used to keep track of whether or not to block the message loop (still - // waiting for the user to dismiss the dialog). - bool is_blocking_; + // The observer to notify of acceptance or cancellation. + ConfirmMessageBoxObserver* observer_; DISALLOW_COPY_AND_ASSIGN(ConfirmMessageBoxDialog); }; diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc index 40cf83c..739c336a 100644 --- a/chrome/browser/views/options/passwords_page_view.cc +++ b/chrome/browser/views/options/passwords_page_view.cc @@ -8,7 +8,6 @@ #include "base/string_util.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/confirm_message_box_dialog.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" @@ -215,16 +214,12 @@ void PasswordsPageView::ButtonPressed( views::Button* sender, const views::Event& event) { // Close will result in our destruction. if (sender == &remove_all_button_) { - bool accepted = ConfirmMessageBoxDialog::Run( + ConfirmMessageBoxDialog::Run( GetWindow()->GetNativeWindow(), + this, l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_TEXT_DELETE_ALL_PASSWORDS), l10n_util::GetString( IDS_PASSWORDS_PAGE_VIEW_CAPTION_DELETE_ALL_PASSWORDS)); - - if (accepted) { - // Delete all the Passwords shown. - table_model_.ForgetAndRemoveAllSignons(); - } return; } @@ -256,6 +251,10 @@ void PasswordsPageView::OnRowCountChanged(size_t rows) { remove_all_button_.SetEnabled(rows > 0); } +void PasswordsPageView::OnConfirmMessageAccept() { + table_model_.ForgetAndRemoveAllSignons(); +} + /////////////////////////////////////////////////////////////////////////////// // PasswordsPageView, protected void PasswordsPageView::InitControlLayout() { diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h index d1c0346..6de8785 100644 --- a/chrome/browser/views/options/passwords_page_view.h +++ b/chrome/browser/views/options/passwords_page_view.h @@ -11,8 +11,9 @@ #include "app/table_model.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" -#include "chrome/browser/views/options/options_page_view.h" #include "chrome/browser/password_manager/password_store.h" +#include "chrome/browser/views/confirm_message_box_dialog.h" +#include "chrome/browser/views/options/options_page_view.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" @@ -145,7 +146,8 @@ class PasswordsTableModel : public TableModel, class PasswordsPageView : public OptionsPageView, public views::TableViewObserver, public views::ButtonListener, - public PasswordsTableModelObserver { + public PasswordsTableModelObserver, + public ConfirmMessageBoxObserver { public: explicit PasswordsPageView(Profile* profile); @@ -158,6 +160,9 @@ class PasswordsPageView : public OptionsPageView, // PasswordsTableModelObserver implementation. virtual void OnRowCountChanged(size_t rows); + // ConfirmMessageBoxObserver implementation. + virtual void OnConfirmMessageAccept(); + protected: virtual void InitControlLayout(); |