diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/resources/locale_settings.grd | 10 | ||||
| -rw-r--r-- | chrome/browser/chromeos/options/language_config_view.cc | 19 |
2 files changed, 21 insertions, 8 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index d7d625e..6ac95ed 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -657,6 +657,16 @@ <message name="IDS_GEOLOCATION_EXCEPTION_DIALOG_HEIGHT_LINES" use_name_for_id="true"> 16 </message> + <if expr="pp_ifdef('chromeos')"> + <!-- The width and height of the Languages and Input dialog box in --> + <!-- characters and lines (See above). --> + <message name="IDS_LANGUAGES_INPUT_DIALOG_WIDTH_CHARS" use_name_for_id="true"> + 106 + </message> + <message name="IDS_LANGUAGES_INPUT_DIALOG_HEIGHT_LINES" use_name_for_id="true"> + 26 + </message> + </if> </messages> </release> </grit> diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc index d64fa1e..9872186 100644 --- a/chrome/browser/chromeos/options/language_config_view.cc +++ b/chrome/browser/chromeos/options/language_config_view.cc @@ -63,6 +63,7 @@ enum ButtonTag { // The column set IDs are used for creating the per-language config view. const int kPerLanguageTitleColumnSetId = 1; const int kPerLanguageDoubleColumnSetId = 2; +const int kPerLanguageSingleColumnSetId = 3; } // namespace @@ -119,11 +120,9 @@ class AddLanguageView : public views::View, // views::View overrides: gfx::Size GetPreferredSize() { - // TODO(satorux): Create our own localized content size once the UI is - // done. return gfx::Size(views::Window::GetLocalizedContentsSize( - IDS_FONTSLANG_DIALOG_WIDTH_CHARS, - IDS_FONTSLANG_DIALOG_HEIGHT_LINES)); + IDS_LANGUAGES_INPUT_DIALOG_WIDTH_CHARS, + IDS_LANGUAGES_INPUT_DIALOG_HEIGHT_LINES)); } virtual void Layout() { @@ -318,10 +317,9 @@ std::wstring LanguageConfigView::GetWindowTitle() const { } gfx::Size LanguageConfigView::GetPreferredSize() { - // TODO(satorux): Create our own localized content size once the UI is done. return gfx::Size(views::Window::GetLocalizedContentsSize( - IDS_FONTSLANG_DIALOG_WIDTH_CHARS, - IDS_FONTSLANG_DIALOG_HEIGHT_LINES)); + IDS_LANGUAGES_INPUT_DIALOG_WIDTH_CHARS, + IDS_LANGUAGES_INPUT_DIALOG_HEIGHT_LINES)); } views::View* LanguageConfigView::CreatePerLanguageConfigView( @@ -343,6 +341,11 @@ views::View* LanguageConfigView::CreatePerLanguageConfigView( column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); + column_set = layout->AddColumnSet(kPerLanguageSingleColumnSetId); + column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing); + column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, + GridLayout::USE_PREF, 0, 0); + AddUiLanguageSection(target_language_code, layout); layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing); AddInputMethodSection(target_language_code, layout); @@ -368,7 +371,7 @@ void LanguageConfigView::AddUiLanguageSection(const std::string& language_code, layout->AddView(language_name_label); layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); - layout->StartRow(0, kPerLanguageDoubleColumnSetId); + layout->StartRow(0, kPerLanguageSingleColumnSetId); if (application_locale == language_code) { layout->AddView( new views::Label( |