Consolidate OnKeyEvent and InputMethod code.

views/ime/input_method_win.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/input_method_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/events/event.h"
 
 namespace views {
 
-InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate)
+InputMethodWin::InputMethodWin()
     : active_(false),
       direction_(base::i18n::UNKNOWN_DIRECTION),
       pending_requested_direction_(base::i18n::UNKNOWN_DIRECTION) {
-  set_delegate(delegate);
 }
 
 InputMethodWin::~InputMethodWin() {
   if (widget())
     ime_input_.DisableIME(hwnd());
 }
 
 void InputMethodWin::Init(Widget* widget) {
   InputMethodBase::Init(widget);
 
   // Gets the initial input locale and text direction information.
   OnInputLangChange(0, 0);
 }
 
 void InputMethodWin::OnFocus() {
   DCHECK(!widget_focused());
   InputMethodBase::OnFocus();
   UpdateIMEState();
 }
 
 void InputMethodWin::OnBlur() {
   DCHECK(widget_focused());
   ConfirmCompositionText();
   InputMethodBase::OnBlur();
 }
 
-void InputMethodWin::DispatchKeyEvent(const KeyEvent& key) {
+bool InputMethodWin::OnKeyEvent(const KeyEvent& key) {
   // Handles ctrl-shift key to change text direction and layout alignment.
   if (ui::ImeInput::IsRTLKeyboardLayoutInstalled() && !IsTextInputTypeNone()) {
     ui::KeyboardCode code = key.key_code();
     if (key.type() == ui::ET_KEY_PRESSED) {
       if (code == ui::VKEY_SHIFT) {
         base::i18n::TextDirection dir;
         if (ui::ImeInput::IsCtrlShiftPressed(&dir))
           pending_requested_direction_ = dir;
       } else if (code != ui::VKEY_CONTROL) {
         pending_requested_direction_ = base::i18n::UNKNOWN_DIRECTION;
       }
     } else if (key.type() == ui::ET_KEY_RELEASED &&
                (code == ui::VKEY_SHIFT || code == ui::VKEY_CONTROL) &&
                pending_requested_direction_ != base::i18n::UNKNOWN_DIRECTION) {
       GetTextInputClient()->ChangeTextDirectionAndLayoutAlignment(
           pending_requested_direction_);
       pending_requested_direction_ = base::i18n::UNKNOWN_DIRECTION;
     }
   }
-
-  DispatchKeyEventPostIME(key);
+  return false;
 }
 
 void InputMethodWin::OnTextInputTypeChanged(View* view) {
   if (IsViewFocused(view)) {
     ime_input_.CancelIME(hwnd());
     UpdateIMEState();
   }
 }
 
 void InputMethodWin::OnCaretBoundsChanged(View* view) {
@@ skipping 163 matching lines @@
     case ui::TEXT_INPUT_TYPE_PASSWORD:
       ime_input_.DisableIME(hwnd());
       break;
     default:
       ime_input_.EnableIME(hwnd());
       break;
   }
 }
 
 }  // namespace views