summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
diff options
context:
space:
mode:
authorazurewei <azurewei@chromium.org>2015-11-06 00:30:02 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-06 08:30:49 +0000
commit5fcf9a3cc3ab65c9d362d7a39385694ab914ee99 (patch)
tree9496158e5a30caa6e9b98c60feebff5a77f55dd5 /chrome/browser/chromeos/input_method/mock_input_method_manager.cc
parentd00698770563ec58c60c8e2fd8930e1e9ac06e07 (diff)
downloadchromium_src-5fcf9a3cc3ab65c9d362d7a39385694ab914ee99.zip
chromium_src-5fcf9a3cc3ab65c9d362d7a39385694ab914ee99.tar.gz
chromium_src-5fcf9a3cc3ab65c9d362d7a39385694ab914ee99.tar.bz2
Make ChromeOS IME APIs platform-independent, step 2: Combine class chromeos::InputMethodInterface with ui::IMEEngineHandlerInterface.
See the step 1 in: https://codereview.chromium.org/1403543004/ As class chromeos::InputMethodEngineInterface and ui::IMEEngineHandlerInterface both are virtual classes and implemented by chromeos::input_method::InputMethodEngine. We can combine these two classes as one for a substantially cleaner code structure. Main changes: 1. Delete class chromeos::InputMethodEngineInterface and remove all its virtual functions to class ui::IMEEngineHandlerInterface. 2. Add new class ui::IMEEngineObserver (original class chromeos::InputMethodEngineInterface::Observer). 3. Combine duplicated struct InputMethodEngineInterface::InputContext with IMEEngineHandlerInterface::InputContext, and add ConvertInputContextXxxx functions in IMEObserver for information transformation between the browser and extension. 4. Combine duplicated typedef KeyEventHandle and KeyEventDoneCallback, and store copy of KeyEventDoneCallback in RequestMap rather than allocate on heap. 5. Update all related files including and namespace using. BUG=517773 TEST=No compiling errors. Review URL: https://codereview.chromium.org/1419593002 Cr-Commit-Position: refs/heads/master@{#358285}
Diffstat (limited to 'chrome/browser/chromeos/input_method/mock_input_method_manager.cc')
-rw-r--r--chrome/browser/chromeos/input_method/mock_input_method_manager.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
index 7254bf9..ef233ac 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
@@ -116,8 +116,7 @@ void MockInputMethodManager::ActivateInputMethodMenuItem(
void MockInputMethodManager::State::AddInputMethodExtension(
const std::string& extension_id,
const InputMethodDescriptors& descriptors,
- InputMethodEngineInterface* instance) {
-}
+ ui::IMEEngineHandlerInterface* instance) {}
void MockInputMethodManager::State::RemoveInputMethodExtension(
const std::string& extension_id) {