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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.cc

Issue 10416028: Rename chromeos::input_method::kLeftControl to chromeos::input_method::kControl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months 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/ui/webui/chromeos/keyboard_overlay_ui.cc ('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/options2/chromeos/keyboard_handler2.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/keyboard_handler2.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 8 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
9 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
11 11
12 namespace { 12 namespace {
13 const struct ModifierKeysSelectItem { 13 const struct ModifierKeysSelectItem {
14 int message_id; 14 int message_id;
15 chromeos::input_method::ModifierKey value; 15 chromeos::input_method::ModifierKey value;
16 } kModifierKeysSelectItems[] = { 16 } kModifierKeysSelectItems[] = {
17 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_SEARCH, 17 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_SEARCH,
18 chromeos::input_method::kSearchKey }, 18 chromeos::input_method::kSearchKey },
19 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_LEFT_CTRL, 19 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_LEFT_CTRL,
20 chromeos::input_method::kLeftControlKey }, 20 chromeos::input_method::kControlKey },
21 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_LEFT_ALT, 21 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_LEFT_ALT,
22 chromeos::input_method::kLeftAltKey }, 22 chromeos::input_method::kAltKey },
23 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_VOID, 23 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_VOID,
24 chromeos::input_method::kVoidKey }, 24 chromeos::input_method::kVoidKey },
25 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_CAPS_LOCK, 25 { IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_CAPS_LOCK,
26 chromeos::input_method::kCapsLockKey }, 26 chromeos::input_method::kCapsLockKey },
27 }; 27 };
28 28
29 const char* kDataValuesNames[] = { 29 const char* kDataValuesNames[] = {
30 "xkbRemapSearchKeyToValue", 30 "xkbRemapSearchKeyToValue",
31 "xkbRemapControlKeyToValue", 31 "xkbRemapControlKeyToValue",
32 "xkbRemapAltKeyToValue", 32 "xkbRemapAltKeyToValue",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16( 73 option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
74 message_id))); 74 message_id)));
75 list_value->Append(option); 75 list_value->Append(option);
76 } 76 }
77 localized_strings->Set(kDataValuesNames[i], list_value); 77 localized_strings->Set(kDataValuesNames[i], list_value);
78 } 78 }
79 } 79 }
80 80
81 } // namespace options2 81 } // namespace options2
82 } // namespace chromeos 82 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698