summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 23:53:49 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 23:53:49 +0000
commitcd91a007e765486a6b84222bdec474f75bc1fa33 (patch)
tree32e1c2af8e8ab414790859c665c18e7c6b14cce9 /chrome
parentf9e904945c9266d0f77e174ccfd95f468699f2f6 (diff)
downloadchromium_src-cd91a007e765486a6b84222bdec474f75bc1fa33.zip
chromium_src-cd91a007e765486a6b84222bdec474f75bc1fa33.tar.gz
chromium_src-cd91a007e765486a6b84222bdec474f75bc1fa33.tar.bz2
DOMUI Settings: UTH: Fix up Downloads section
- Downloads label, input, button should be on one line. - Remove 'You can clear these settings...' text. BUG=63840 TEST=visual Review URL: http://codereview.chromium.org/5649002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd4
-rw-r--r--chrome/browser/dom_ui/options/advanced_options_handler.cc2
-rw-r--r--chrome/browser/resources/options/advanced_options.html6
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f3d6135..e2900c0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6844,6 +6844,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
Ask where to save each file before downloading
</message>
+ <message name="IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY" desc="The information label for the 'Clear auto-opening settings' button">
+ You have chosen to open certain file types automatically after downloading.
+ </message>
+
<message name="IDS_OPTIONS_AUTOOPENFILETYPES_INFO" desc="The information label for the 'Reset always open files' button">
You have chosen to open certain file types automatically after downloading. You can clear these settings so that downloaded files don't open automatically.
</message>
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index 486c2dd..e3975fe 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -79,7 +79,7 @@ void AdvancedOptionsHandler::GetLocalizedValues(
l10n_util::GetStringUTF16(
IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION));
localized_strings->SetString("autoOpenFileTypesInfo",
- l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_INFO));
+ l10n_util::GetStringUTF16(IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY));
localized_strings->SetString("autoOpenFileTypesResetToDefault",
l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT));
localized_strings->SetString("gearSettingsGroupName",
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 758e06c..a987563 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -115,9 +115,11 @@
<h3 i18n-content="downloadLocationGroupName"></h3>
<div>
<if expr="not pp_ifdef('chromeos')">
- <div i18n-content="downloadLocationBrowseTitle"></div>
<div>
- <input id="downloadLocationPath" type="text" size="60" disabled>
+ <label>
+ <span i18n-content="downloadLocationBrowseTitle"></span>
+ <input id="downloadLocationPath" type="text" size="60" disabled>
+ </label>
<button id="downloadLocationBrowseButton"
i18n-content="downloadLocationBrowseButton"></button>
</div>