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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: load.cc

Issue 3155020: Add GetHardwareKeyboardLayoutName method instead of kHardwareLayout (Closed) Base URL: http://src.chromium.org/git/cros.git
Patch Set: add GethardwareKeyboardLayoutName() Created 10 years, 4 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
« no previous file with comments | « chromeos_keyboard.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) 2010 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium OS 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 <cstdio> 5 #include <cstdio>
6 #include <dlfcn.h> 6 #include <dlfcn.h>
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "chromeos_cros_api.h" // NOLINT 9 #include "chromeos_cros_api.h" // NOLINT
10 #include "chromeos_cryptohome.h" // NOLINT 10 #include "chromeos_cryptohome.h" // NOLINT
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 InputMethodUiStatusConnection*, 106 InputMethodUiStatusConnection*,
107 const InputMethodUiStatusMonitorFunctions&, 107 const InputMethodUiStatusMonitorFunctions&,
108 void*); 108 void*);
109 DECL_FUNC_1(DisconnectInputMethodUiStatus, 109 DECL_FUNC_1(DisconnectInputMethodUiStatus,
110 void, 110 void,
111 InputMethodUiStatusConnection*); 111 InputMethodUiStatusConnection*);
112 DECL_FUNC_4(NotifyCandidateClicked, void, 112 DECL_FUNC_4(NotifyCandidateClicked, void,
113 InputMethodUiStatusConnection*, int, int, int); 113 InputMethodUiStatusConnection*, int, int, int);
114 114
115 // Keyboard 115 // Keyboard
116 DECL_FUNC_0(GetHardwareKeyboardLayoutName, std::string);
116 DECL_FUNC_0(GetCurrentKeyboardLayoutName, std::string); 117 DECL_FUNC_0(GetCurrentKeyboardLayoutName, std::string);
117 DECL_FUNC_1(SetCurrentKeyboardLayoutByName, bool, const std::string&); 118 DECL_FUNC_1(SetCurrentKeyboardLayoutByName, bool, const std::string&);
118 DECL_FUNC_1(RemapModifierKeys, bool, const ModifierMap&); 119 DECL_FUNC_1(RemapModifierKeys, bool, const ModifierMap&);
119 DECL_FUNC_1(GetKeyboardLayoutPerWindow, bool, bool*); 120 DECL_FUNC_1(GetKeyboardLayoutPerWindow, bool, bool*);
120 DECL_FUNC_1(SetKeyboardLayoutPerWindow, bool, bool); 121 DECL_FUNC_1(SetKeyboardLayoutPerWindow, bool, bool);
121 DECL_FUNC_1(GetAutoRepeatEnabled, bool, bool*); 122 DECL_FUNC_1(GetAutoRepeatEnabled, bool, bool*);
122 DECL_FUNC_1(SetAutoRepeatEnabled, bool, bool); 123 DECL_FUNC_1(SetAutoRepeatEnabled, bool, bool);
123 DECL_FUNC_1(GetAutoRepeatRate, bool, chromeos::AutoRepeatRate*); 124 DECL_FUNC_1(GetAutoRepeatRate, bool, chromeos::AutoRepeatRate*);
124 DECL_FUNC_1(SetAutoRepeatRate, bool, const chromeos::AutoRepeatRate&); 125 DECL_FUNC_1(SetAutoRepeatRate, bool, const chromeos::AutoRepeatRate&);
125 126
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 INIT_FUNC(ChangeInputMethod); 295 INIT_FUNC(ChangeInputMethod);
295 INIT_FUNC(SetImePropertyActivated); 296 INIT_FUNC(SetImePropertyActivated);
296 INIT_FUNC(GetImeConfig); 297 INIT_FUNC(GetImeConfig);
297 INIT_FUNC(SetImeConfig); 298 INIT_FUNC(SetImeConfig);
298 INIT_FUNC(InputMethodStatusConnectionIsAlive); 299 INIT_FUNC(InputMethodStatusConnectionIsAlive);
299 INIT_FUNC(MonitorInputMethodUiStatus); 300 INIT_FUNC(MonitorInputMethodUiStatus);
300 INIT_FUNC(DisconnectInputMethodUiStatus); 301 INIT_FUNC(DisconnectInputMethodUiStatus);
301 INIT_FUNC(NotifyCandidateClicked); 302 INIT_FUNC(NotifyCandidateClicked);
302 303
303 // Keyboard 304 // Keyboard
305 INIT_FUNC(GetHardwareKeyboardLayoutName);
304 INIT_FUNC(GetCurrentKeyboardLayoutName); 306 INIT_FUNC(GetCurrentKeyboardLayoutName);
305 INIT_FUNC(SetCurrentKeyboardLayoutByName); 307 INIT_FUNC(SetCurrentKeyboardLayoutByName);
306 INIT_FUNC(RemapModifierKeys); 308 INIT_FUNC(RemapModifierKeys);
307 INIT_FUNC(GetKeyboardLayoutPerWindow); 309 INIT_FUNC(GetKeyboardLayoutPerWindow);
308 INIT_FUNC(SetKeyboardLayoutPerWindow); 310 INIT_FUNC(SetKeyboardLayoutPerWindow);
309 INIT_FUNC(GetAutoRepeatEnabled); 311 INIT_FUNC(GetAutoRepeatEnabled);
310 INIT_FUNC(SetAutoRepeatEnabled); 312 INIT_FUNC(SetAutoRepeatEnabled);
311 INIT_FUNC(GetAutoRepeatRate); 313 INIT_FUNC(GetAutoRepeatRate);
312 INIT_FUNC(SetAutoRepeatRate); 314 INIT_FUNC(SetAutoRepeatRate);
313 315
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // System 403 // System
402 INIT_FUNC(GetTimezoneID); 404 INIT_FUNC(GetTimezoneID);
403 INIT_FUNC(SetTimezoneID); 405 INIT_FUNC(SetTimezoneID);
404 INIT_FUNC(GetMachineInfo); 406 INIT_FUNC(GetMachineInfo);
405 INIT_FUNC(FreeMachineInfo); 407 INIT_FUNC(FreeMachineInfo);
406 408
407 return error_string.empty(); 409 return error_string.empty();
408 } 410 }
409 411
410 } // namespace chromeos 412 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos_keyboard.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698