Consolidate OnKeyEvent and InputMethod code.

views/widget/widget.cc

Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 4472d93701883fe39bfd34c072a916e07167f661..d35e420f5504b4c061cc2b0b06d6b37ab6a43022 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -326,6 +326,13 @@ void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   RefreshCompositeTree();
 }
 
+void Widget::OnKeyEvent(const KeyEvent& event) {
+  if (GetInputMethod())
+    GetInputMethod()->DispatchKeyEvent(event);
+  else
+    DispatchKeyEventPostIME(event);

[Ben Goodger (Google), 2011/04/12 21:11:15]

I looked at InputMethod's DispatchKeyEvent/calling of DispatchKeyEventPostIME. I
don't think there's any asynchronousness here. This function should be
re-written as:

bool handled = true;
if (GetInputMethod())
  handled = GetInputMethod()->OnKeyEvent(event);
return handled ? GetRootView()->OnKeyEvent(event) : false;

... you are renaming InputMethod::DispatchKeyEvent to OnKeyEvent, and making it
return a bool if further processing is required.

Then you can also delete the InputMethodDelegate implementation in this class.

[msw, 2011/04/14 21:47:39]

Done. My updated changes roughly follow this approach.

+}
+
 bool Widget::OnMouseEvent(const MouseEvent& event) {
   switch (event.type()) {
     case ui::ET_MOUSE_PRESSED:
@@ -400,6 +407,13 @@ View* Widget::GetFocusTraversableParentView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Widget, internal::InputMethodDelegate implementation:
+
+bool Widget::DispatchKeyEventPostIME(const KeyEvent& key) {
+  return GetRootView()->ProcessKeyEvent(key);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 RootView* Widget::CreateRootView() {