summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/chromeos/dom_ui/system_options_handler.cc6
-rw-r--r--chrome/browser/resources/options/chromeos_system_options.html8
-rw-r--r--chrome/browser/resources/options/chromeos_system_options_page.css3
-rw-r--r--chrome/browser/resources/options/options.html1
5 files changed, 24 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index fb9f44b..d2ce2c3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9311,6 +9311,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION" desc="In the settings tab, the text next to the slider for the touchpad touch sensitivity.">
Sensitivity:
</message>
+ <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_LESS_DESCRIPTION" desc="In the settings tab, the text under the left (less sensitive) side of the slider for the touchpad touch sensitivity.">
+ Less
+ </message>
+ <message name="IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION" desc="In the settings tab, the text under the right (more sensitive) side of the slider for the touchpad touch sensitivity.">
+ More
+ </message>
<message name="IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for accessbility.">
Enable accessibility features
</message>
diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc
index 9c6398c..95f87e6 100644
--- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc
@@ -49,6 +49,12 @@ void SystemOptionsHandler::GetLocalizedValues(
IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION));
localized_strings->SetString("sensitivity",
l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION));
+ localized_strings->SetString("sensitivity_less",
+ l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_SENSITIVITY_LESS_DESCRIPTION));
+ localized_strings->SetString("sensitivity_more",
+ l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION));
localized_strings->SetString("language",
l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE));
diff --git a/chrome/browser/resources/options/chromeos_system_options.html b/chrome/browser/resources/options/chromeos_system_options.html
index c62f1ca..93cf00b 100644
--- a/chrome/browser/resources/options/chromeos_system_options.html
+++ b/chrome/browser/resources/options/chromeos_system_options.html
@@ -25,6 +25,14 @@
</td>
</tr>
<tr>
+ <td></td>
+ <td>
+ <span i18n-content="sensitivity_less"></span>
+ <span i18n-content="sensitivity_more"
+ class="touchpad-sensitivity-more"></span>
+ </td>
+ </tr>
+ <tr>
<td class="option-name" colspan="2">
<label class="checkbox">
<input id="tap-to-click-check"
diff --git a/chrome/browser/resources/options/chromeos_system_options_page.css b/chrome/browser/resources/options/chromeos_system_options_page.css
new file mode 100644
index 0000000..988c987
--- /dev/null
+++ b/chrome/browser/resources/options/chromeos_system_options_page.css
@@ -0,0 +1,3 @@
+.touchpad-sensitivity-more {
+ float: right;
+}
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index c75758a..04e60b5 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -36,6 +36,7 @@
<link rel="stylesheet" href="chromeos_accounts_options_page.css">
<link rel="stylesheet" href="chromeos_internet_options_page.css">
<link rel="stylesheet" href="chromeos_proxy.css">
+ <link rel="stylesheet" href="chromeos_system_options_page.css">
</if>
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">