summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/resources/locale_settings.grd2
-rw-r--r--chrome/app/resources/locale_settings_ml.xtb3
-rw-r--r--chrome/app/resources/locale_settings_ta.xtb3
-rw-r--r--chrome/browser/views/options/content_settings_window_view.cc10
4 files changed, 12 insertions, 6 deletions
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index eab7f03..918884d 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -268,7 +268,7 @@
</message>
<!-- The width of the list box in the Content Settings dialog box, in characters (character width = -->
- <!-- average character width for default dialog box font) -->
+ <!-- average character width for default list box font) -->
<message name="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS" use_name_for_id="true">
18
</message>
diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb
index 4195bd1..2e6d58d 100644
--- a/chrome/app/resources/locale_settings_ml.xtb
+++ b/chrome/app/resources/locale_settings_ml.xtb
@@ -60,4 +60,7 @@
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">10</translation>
<translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
<translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">88</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">30</translation>
</translationbundle>
diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb
index 41c0005..79ff1c4 100644
--- a/chrome/app/resources/locale_settings_ta.xtb
+++ b/chrome/app/resources/locale_settings_ta.xtb
@@ -60,4 +60,7 @@
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
<translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
<translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS">23</translation>
</translationbundle>
diff --git a/chrome/browser/views/options/content_settings_window_view.cc b/chrome/browser/views/options/content_settings_window_view.cc
index c956457..f763e9e 100644
--- a/chrome/browser/views/options/content_settings_window_view.cc
+++ b/chrome/browser/views/options/content_settings_window_view.cc
@@ -118,23 +118,23 @@ void ContentSettingsWindowView::ListboxSelectionChanged(
// ContentSettingsWindowView, views::View overrides:
void ContentSettingsWindowView::Layout() {
- int list_box_width = views::Window::GetLocalizedContentsWidth(
+ int listbox_width = views::Window::GetLocalizedContentsWidth(
IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS);
label_->SetBounds(kDialogPadding,
kDialogPadding,
- list_box_width,
+ listbox_width,
label_->GetPreferredSize().height());
listbox_->SetBounds(kDialogPadding,
2 * kDialogPadding + label_->height(),
- list_box_width,
+ listbox_width,
height() - (3 * kDialogPadding) - label_->height());
if (pages_[current_page_]->GetParent()) {
pages_[current_page_]->SetBounds(
- 2 * kDialogPadding + list_box_width,
+ 2 * kDialogPadding + listbox_width,
2 * kDialogPadding + label_->height(),
- width() - (3 * kDialogPadding) - list_box_width,
+ width() - (3 * kDialogPadding) - listbox_width,
height() - (2 * kDialogPadding));
}
}