Consolidate OnKeyEvent and InputMethod code.

views/ime/mock_input_method.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/ime/mock_input_method.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/events/event.h"
@@ skipping 12 matching lines @@
       active_(true) {
 }
 
 MockInputMethod::~MockInputMethod() {
 }
 
 void MockInputMethod::Init(Widget* widget) {
   InputMethodBase::Init(widget);
 }
 
-void MockInputMethod::DispatchKeyEvent(const KeyEvent& key) {
+bool MockInputMethod::OnKeyEvent(const KeyEvent& key) {
   bool handled = (composition_changed_ || result_text_.length()) &&
       !IsTextInputTypeNone();
 
   ClearStates();
   if (handled) {
     KeyEvent mock_key(ui::ET_KEY_PRESSED, ui::VKEY_PROCESSKEY, key.flags());
     DispatchKeyEventPostIME(mock_key);
   } else {
     DispatchKeyEventPostIME(key);
   }
 
   if (focus_changed_)
-    return;
+    return true;
 
   TextInputClient* client = GetTextInputClient();
   if (client) {
     if (handled) {
       if (result_text_.length())
         client->InsertText(result_text_);
       if (composition_changed_) {
         if (composition_.text.length())
           client->SetCompositionText(composition_);
         else
           client->ClearCompositionText();
       }
     } else if (key.type() == ui::ET_KEY_PRESSED) {
       char16 ch = key.GetCharacter();
       client->InsertChar(ch, key.flags());
     }
   }
 
   ClearResult();
+  return true;
 }
 
 void MockInputMethod::OnTextInputTypeChanged(View* view) {
   DCHECK(IsViewFocused(view));
   text_input_type_changed_ = true;
 }
 
 void MockInputMethod::OnCaretBoundsChanged(View* view) {
   DCHECK(IsViewFocused(view));
   caret_bounds_changed_ = true;
@@ skipping 69 matching lines @@
   cancel_composition_called_ = false;
 }
 
 void MockInputMethod::ClearResult() {
   composition_.Clear();
   composition_changed_ = false;
   result_text_.clear();
 }
 
 }  // namespace views