| Index: load.cc
|
| diff --git a/load.cc b/load.cc
|
| index 80d6f0adee2e6181bc81adb55cf922bedb737d78..42dea5ba0e234efa8a645bedf492e61700469d2c 100644
|
| --- a/load.cc
|
| +++ b/load.cc
|
| @@ -19,7 +19,7 @@ typedef PowerStatusConnection (*MonitorPowerStatusType)(PowerMonitor, void*);
|
| typedef void (*DisconnectPowerStatusType)(PowerStatusConnection);
|
| typedef bool (*RetrievePowerInformationType)(PowerInformation* information);
|
| typedef LanguageStatusConnection* (*MonitorLanguageStatusType)(
|
| - LanguageStatusMonitorFunction, void*);
|
| + LanguageStatusMonitorFunctions, void*);
|
| typedef void (*DisconnectLanguageStatusType)(LanguageStatusConnection*);
|
| typedef InputLanguageList* (*GetLanguagesType)(LanguageStatusConnection*);
|
| typedef void (*ChangeLanguageType)(
|
| @@ -28,6 +28,10 @@ typedef bool (*ActivateLanguageType)(
|
| LanguageStatusConnection*, LanguageCategory, const char*);
|
| typedef bool (*DeactivateLanguageType)(
|
| LanguageStatusConnection*, LanguageCategory, const char*);
|
| +typedef void (*ActivateImePropertyType)(
|
| + LanguageStatusConnection*, const char*);
|
| +typedef void (*DeactivateImePropertyType)(
|
| + LanguageStatusConnection*, const char*);
|
| typedef ImeStatusConnection* (*MonitorImeStatusType)(
|
| const ImeStatusMonitorFunctions&, void*);
|
| typedef void (*DisconnectImeStatusType)(ImeStatusConnection*);
|
| @@ -63,6 +67,8 @@ GetLanguagesType GetSupportedLanguages = 0;
|
| ChangeLanguageType ChangeLanguage = 0;
|
| ActivateLanguageType ActivateLanguage = 0;
|
| DeactivateLanguageType DeactivateLanguage = 0;
|
| +ActivateImePropertyType ActivateImeProperty = 0;
|
| +DeactivateImePropertyType DeactivateImeProperty = 0;
|
|
|
| MonitorImeStatusType MonitorImeStatus = 0;
|
| DisconnectImeStatusType DisconnectImeStatus = 0;
|
| @@ -129,6 +135,10 @@ bool LoadCros(const char* path_to_libcros) {
|
| ::dlsym(handle, "ChromeOSActivateLanguage"));
|
| DeactivateLanguage = DeactivateLanguageType(
|
| ::dlsym(handle, "ChromeOSDeactivateLanguage"));
|
| + ActivateImeProperty = ActivateImePropertyType(
|
| + ::dlsym(handle, "ChromeOSActivateImeProperty"));
|
| + DeactivateImeProperty = DeactivateImePropertyType(
|
| + ::dlsym(handle, "ChromeOSDeactivateImeProperty"));
|
|
|
| MonitorImeStatus = MonitorImeStatusType(
|
| ::dlsym(handle, "ChromeOSMonitorImeStatus"));
|
| @@ -186,6 +196,8 @@ bool LoadCros(const char* path_to_libcros) {
|
| && ChangeLanguage
|
| && ActivateLanguage
|
| && DeactivateLanguage
|
| + && ActivateImeProperty
|
| + && DeactivateImeProperty
|
| && MonitorImeStatus
|
| && DisconnectImeStatus
|
| && NotifyCandidateClicked
|
|
|