| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/keyboard_handler.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/chromeos/input_method/xkeyboard.h" | 9 #include "chrome/browser/chromeos/input_method/xkeyboard.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_LABEL)); | 56 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_LABEL)); |
| 57 localized_strings->SetString("remapControlKeyToContent", | 57 localized_strings->SetString("remapControlKeyToContent", |
| 58 l10n_util::GetStringUTF16( | 58 l10n_util::GetStringUTF16( |
| 59 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_CTRL_LABEL)); | 59 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_CTRL_LABEL)); |
| 60 localized_strings->SetString("remapAltKeyToContent", | 60 localized_strings->SetString("remapAltKeyToContent", |
| 61 l10n_util::GetStringUTF16( | 61 l10n_util::GetStringUTF16( |
| 62 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_ALT_LABEL)); | 62 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_LEFT_ALT_LABEL)); |
| 63 localized_strings->SetString("remapCapsLockKeyToContent", | 63 localized_strings->SetString("remapCapsLockKeyToContent", |
| 64 l10n_util::GetStringUTF16( | 64 l10n_util::GetStringUTF16( |
| 65 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_CAPS_LOCK_LABEL)); | 65 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_CAPS_LOCK_LABEL)); |
| 66 localized_strings->SetString("searchKeyActsAsFunctionKey", | |
| 67 l10n_util::GetStringUTF16( | |
| 68 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION)); | |
| 69 localized_strings->SetString("changeLanguageAndInputSettings", | 66 localized_strings->SetString("changeLanguageAndInputSettings", |
| 70 l10n_util::GetStringUTF16( | 67 l10n_util::GetStringUTF16( |
| 71 IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS)); | 68 IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS)); |
| 72 | 69 |
| 73 for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) { | 70 for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) { |
| 74 ListValue* list_value = new ListValue(); | 71 ListValue* list_value = new ListValue(); |
| 75 for (size_t j = 0; j < arraysize(kModifierKeysSelectItems); ++j) { | 72 for (size_t j = 0; j < arraysize(kModifierKeysSelectItems); ++j) { |
| 76 const input_method::ModifierKey value = | 73 const input_method::ModifierKey value = |
| 77 kModifierKeysSelectItems[j].value; | 74 kModifierKeysSelectItems[j].value; |
| 78 const int message_id = kModifierKeysSelectItems[j].message_id; | 75 const int message_id = kModifierKeysSelectItems[j].message_id; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 99 const base::FundamentalValue show_options(true); | 96 const base::FundamentalValue show_options(true); |
| 100 | 97 |
| 101 if (!chromeos_keyboard) { | 98 if (!chromeos_keyboard) { |
| 102 web_ui()->CallJavascriptFunction( | 99 web_ui()->CallJavascriptFunction( |
| 103 "options.KeyboardOverlay.showCapsLockOptions", show_options); | 100 "options.KeyboardOverlay.showCapsLockOptions", show_options); |
| 104 } | 101 } |
| 105 } | 102 } |
| 106 | 103 |
| 107 } // namespace options | 104 } // namespace options |
| 108 } // namespace chromeos | 105 } // namespace chromeos |
| OLD | NEW |