Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc

Issue 11418256: Add the link to "languages and input settings" into Keyboard settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix fypo Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options/chromeos/keyboard_overlay.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
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", 66 localized_strings->SetString("searchKeyActsAsFunctionKey",
67 l10n_util::GetStringUTF16( 67 l10n_util::GetStringUTF16(
68 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION)); 68 IDS_OPTIONS_SETTINGS_LANGUAGES_KEY_SEARCH_AS_FUNCTION));
69 localized_strings->SetString("changeLanguageAndInputSettings",
70 l10n_util::GetStringUTF16(
71 IDS_OPTIONS_SETTINGS_CHANGE_LANGUAGE_AND_INPUT_SETTINGS));
69 72
70 for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) { 73 for (size_t i = 0; i < arraysize(kDataValuesNames); ++i) {
71 ListValue* list_value = new ListValue(); 74 ListValue* list_value = new ListValue();
72 for (size_t j = 0; j < arraysize(kModifierKeysSelectItems); ++j) { 75 for (size_t j = 0; j < arraysize(kModifierKeysSelectItems); ++j) {
73 const input_method::ModifierKey value = 76 const input_method::ModifierKey value =
74 kModifierKeysSelectItems[j].value; 77 kModifierKeysSelectItems[j].value;
75 const int message_id = kModifierKeysSelectItems[j].message_id; 78 const int message_id = kModifierKeysSelectItems[j].message_id;
76 // Only the seach key can be remapped to the caps lock key. 79 // Only the seach key can be remapped to the caps lock key.
77 if (kDataValuesNames[i] != std::string("remapSearchKeyToValue") && 80 if (kDataValuesNames[i] != std::string("remapSearchKeyToValue") &&
78 kDataValuesNames[i] != std::string("remapCapsLockKeyToValue") && 81 kDataValuesNames[i] != std::string("remapCapsLockKeyToValue") &&
(...skipping 24 matching lines...) Expand all
103 } 106 }
104 107
105 if (chromebook_function_key) { 108 if (chromebook_function_key) {
106 web_ui()->CallJavascriptFunction( 109 web_ui()->CallJavascriptFunction(
107 "options.KeyboardOverlay.showFunctionKeyOptions", show_options); 110 "options.KeyboardOverlay.showFunctionKeyOptions", show_options);
108 } 111 }
109 } 112 }
110 113
111 } // namespace options 114 } // namespace options
112 } // namespace chromeos 115 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/chromeos/keyboard_overlay.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698