Consolidate OnKeyEvent and InputMethod code.

views/widget/widget.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/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "views/focus/view_storage.h"
@@ skipping 308 matching lines @@
 
 bool Widget::HasFocusManager() const {
   return !!focus_manager_.get();
 }
 
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   GetRootView()->Paint(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:
       last_mouse_event_was_move_ = false;
       if (GetRootView()->OnMousePressed(event)) {
         is_mouse_button_pressed_ = true;
         if (!native_widget_->HasMouseCapture())
           native_widget_->SetMouseCapture();
         return true;
       }
@@ skipping 54 matching lines @@
 }
 
 View* Widget::GetFocusTraversableParentView() {
   // We are a proxy to the root view, so we should be bypassed when traversing
   // up and as a result this should not be called.
   NOTREACHED();
   return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Widget, internal::InputMethodDelegate implementation:
+
+bool Widget::DispatchKeyEventPostIME(const KeyEvent& key) {
+  return GetRootView()->ProcessKeyEvent(key);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 RootView* Widget::CreateRootView() {
   return new RootView(this);
 }
 
 void Widget::DestroyRootView() {
   root_view_.reset();
 
   // Defer focus manager's destruction. This is for the case when the
@@ skipping 35 matching lines @@
     compositor_ = ui::Compositor::Create(widget);
 
   return compositor_.get() != NULL;
 }
 
 bool Widget::ShouldReleaseCaptureOnMouseReleased() const {
   return true;
 }
 
 }  // namespace views