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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: load.cc

Issue 6101006: Add StopInputMethodProcess API which allows Chrome to terminate ibus-daemon in a nicer way than kill (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/cros.git@master
Patch Set: review fix, add URL Created 9 years, 11 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 | « chromeos_input_method.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 #include <vector> 8 #include <vector>
9 9
10 #include <base/basictypes.h> 10 #include <base/basictypes.h>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 // Input methods 83 // Input methods
84 DECL_FUNC_5(MonitorInputMethodStatus, 84 DECL_FUNC_5(MonitorInputMethodStatus,
85 InputMethodStatusConnection*, 85 InputMethodStatusConnection*,
86 void*, 86 void*,
87 chromeos::LanguageCurrentInputMethodMonitorFunction, 87 chromeos::LanguageCurrentInputMethodMonitorFunction,
88 chromeos::LanguageRegisterImePropertiesFunction, 88 chromeos::LanguageRegisterImePropertiesFunction,
89 chromeos::LanguageUpdateImePropertyFunction, 89 chromeos::LanguageUpdateImePropertyFunction,
90 chromeos::LanguageConnectionChangeMonitorFunction); 90 chromeos::LanguageConnectionChangeMonitorFunction);
91 DECL_FUNC_1(DisconnectInputMethodStatus, void, InputMethodStatusConnection*); 91 DECL_FUNC_1(DisconnectInputMethodStatus, void, InputMethodStatusConnection*);
92 DECL_FUNC_1(StopInputMethodProcess, bool, InputMethodStatusConnection*);
92 DECL_FUNC_1(GetSupportedInputMethods, 93 DECL_FUNC_1(GetSupportedInputMethods,
93 InputMethodDescriptors*, InputMethodStatusConnection*); 94 InputMethodDescriptors*, InputMethodStatusConnection*);
94 DECL_FUNC_1(GetActiveInputMethods, 95 DECL_FUNC_1(GetActiveInputMethods,
95 InputMethodDescriptors*, InputMethodStatusConnection*); 96 InputMethodDescriptors*, InputMethodStatusConnection*);
96 DECL_FUNC_2(SetActiveInputMethods, 97 DECL_FUNC_2(SetActiveInputMethods,
97 bool, 98 bool,
98 InputMethodStatusConnection*, 99 InputMethodStatusConnection*,
99 const ImeConfigValue&); 100 const ImeConfigValue&);
100 DECL_FUNC_2(ChangeInputMethod, 101 DECL_FUNC_2(ChangeInputMethod,
101 bool, InputMethodStatusConnection*, const char*); 102 bool, InputMethodStatusConnection*, const char*);
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 INIT_FUNC(MonitorPowerStatus); 393 INIT_FUNC(MonitorPowerStatus);
393 INIT_FUNC(DisconnectPowerStatus); 394 INIT_FUNC(DisconnectPowerStatus);
394 INIT_FUNC(RetrievePowerInformation); 395 INIT_FUNC(RetrievePowerInformation);
395 INIT_FUNC(EnableScreenLock); 396 INIT_FUNC(EnableScreenLock);
396 INIT_FUNC(RequestRestart); 397 INIT_FUNC(RequestRestart);
397 INIT_FUNC(RequestShutdown); 398 INIT_FUNC(RequestShutdown);
398 399
399 // Input methods 400 // Input methods
400 INIT_FUNC(MonitorInputMethodStatus); 401 INIT_FUNC(MonitorInputMethodStatus);
401 INIT_FUNC(DisconnectInputMethodStatus); 402 INIT_FUNC(DisconnectInputMethodStatus);
403 INIT_FUNC(StopInputMethodProcess);
402 INIT_FUNC(GetSupportedInputMethods); 404 INIT_FUNC(GetSupportedInputMethods);
403 INIT_FUNC(GetActiveInputMethods); 405 INIT_FUNC(GetActiveInputMethods);
404 INIT_FUNC(SetActiveInputMethods); 406 INIT_FUNC(SetActiveInputMethods);
405 INIT_FUNC(ChangeInputMethod); 407 INIT_FUNC(ChangeInputMethod);
406 INIT_FUNC(GetCurrentInputMethod); 408 INIT_FUNC(GetCurrentInputMethod);
407 INIT_FUNC(SetImePropertyActivated); 409 INIT_FUNC(SetImePropertyActivated);
408 INIT_FUNC(GetImeConfig); 410 INIT_FUNC(GetImeConfig);
409 INIT_FUNC(SetImeConfig); 411 INIT_FUNC(SetImeConfig);
410 INIT_FUNC(InputMethodStatusConnectionIsAlive); 412 INIT_FUNC(InputMethodStatusConnectionIsAlive);
411 INIT_FUNC(MonitorInputMethodUiStatus); 413 INIT_FUNC(MonitorInputMethodUiStatus);
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 INIT_FUNC(FreeMachineInfo); 582 INIT_FUNC(FreeMachineInfo);
581 583
582 // Brightness 584 // Brightness
583 INIT_FUNC(MonitorBrightness); 585 INIT_FUNC(MonitorBrightness);
584 INIT_FUNC(DisconnectBrightness); 586 INIT_FUNC(DisconnectBrightness);
585 587
586 return error_string.empty(); 588 return error_string.empty();
587 } 589 }
588 590
589 } // namespace chromeos 591 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos_input_method.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698