Commit ad5f9633 authored by yoshiki@chromium.org's avatar yoshiki@chromium.org

Add the link to "languages and input settings" into Keyboard settings.

BUG=163204
TEST=manual


Review URL: https://chromiumcodereview.appspot.com/11418256

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170706 0039d316-1c4b-4281-b951-d872f2087c98
parent 1444c1f2
...@@ -2048,6 +2048,10 @@ Press any key to continue exploring. ...@@ -2048,6 +2048,10 @@ Press any key to continue exploring.
desc="The dropdown list item for 'Customize modifier keys' overlay"> desc="The dropdown list item for 'Customize modifier keys' overlay">
Caps Lock Caps Lock
</message> </message>
<message name="IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS"
desc="The link to open 'Language and input settings' window.">
Change language and input settings
</message>
<message name="IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION" <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION"
desc="The checkbox to enable the Search key to act as a Function key"> desc="The checkbox to enable the Search key to act as a Function key">
Use the Search key to access extended keybindings. Use the Search key to access extended keybindings.
......
...@@ -77,6 +77,10 @@ ...@@ -77,6 +77,10 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="content-area">
<button id="languages-and-input-settings" class="link-button"
i18n-content="changeLanguageAndInputSettings"></button>
</div>
<div class="action-area"> <div class="action-area">
<div class="button-strip"> <div class="button-strip">
<button id="keyboard-cancel" type="reset" i18n-content="cancel"></button> <button id="keyboard-cancel" type="reset" i18n-content="cancel"></button>
......
...@@ -20,6 +20,17 @@ cr.define('options', function() { ...@@ -20,6 +20,17 @@ cr.define('options', function() {
KeyboardOverlay.prototype = { KeyboardOverlay.prototype = {
__proto__: options.SettingsDialog.prototype, __proto__: options.SettingsDialog.prototype,
/**
* Initializes the page. This method is called in initialize.
*/
initializePage: function() {
options.SettingsDialog.prototype.initializePage.call(this);
$('languages-and-input-settings').onclick = function(e) {
OptionsPage.navigateToPage('languages');
};
},
/** /**
* Show/hide the caps lock remapping section. * Show/hide the caps lock remapping section.
* @private * @private
......
...@@ -66,6 +66,9 @@ void KeyboardHandler::GetLocalizedValues(DictionaryValue* localized_strings) { ...@@ -66,6 +66,9 @@ void KeyboardHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
localized_strings->SetString("searchKeyActsAsFunctionKey", localized_strings->SetString("searchKeyActsAsFunctionKey",
l10n_util::GetStringUTF16( l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION)); IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION));
localized_strings->SetString("changeLanguageAndInputSettings",
l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS));
for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) { for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) {
ListValue* list_value = new ListValue(); ListValue* list_value = new ListValue();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment