Consolidate OnKeyEvent and InputMethod code.

views/widget/widget_win.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/win/scoped_comptr.h"
 #include "ui/base/win/window_impl.h"
 #include "views/focus/focus_manager.h"
-#include "views/ime/input_method_delegate.h"
 #include "views/layout/layout_manager.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/widget.h"
 
 namespace ui {
 class ViewProp;
 }
 
 namespace gfx {
 class CanvasSkia;
@@ skipping 41 matching lines @@
 //
 //  This Widget contains a RootView which owns the hierarchy of views within it.
 //  As long as views are part of this tree, they will be deleted automatically
 //  when the RootView is destroyed. If you remove a view from the tree, you are
 //  then responsible for cleaning up after it.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class WidgetWin : public ui::WindowImpl,
                   public Widget,
                   public NativeWidget,
-                  public MessageLoopForUI::Observer,
-                  public internal::InputMethodDelegate {
+                  public MessageLoopForUI::Observer {
  public:
   WidgetWin();
   virtual ~WidgetWin();
 
   // Returns the Widget associated with the specified HWND (if any).
   static WidgetWin* GetWidget(HWND hwnd);
 
   // Returns true if we are on Windows Vista or greater and composition is
   // enabled.
   static bool IsAeroGlassEnabled();
@@ skipping 316 matching lines @@
   // Are a subclass of WindowWin?
   bool is_window_;
 
  private:
   typedef ScopedVector<ui::ViewProp> ViewProps;
 
   // Implementation of GetWindow. Ascends the parents of |hwnd| returning the
   // first ancestor that is a Window.
   static Window* GetWindowImpl(HWND hwnd);
 
-  // Returns the RootView that contains the focused view, or NULL if there is no
-  // focused view.
-  RootView* GetFocusedViewRootView();
-
   // Called after the WM_ACTIVATE message has been processed by the default
   // windows procedure.
   static void PostProcessActivateMessage(WidgetWin* widget,
                                          int activation_state);
 
   // Synchronously paints the invalid contents of the Widget.
   void RedrawInvalidRect();
 
   // Synchronously updates the invalid contents of the Widget. Valid for
   // layered windows only.
   void RedrawLayeredWindowContents();
 
   // Responds to the client area changing size, either at window creation time
   // or subsequently.
   void ClientAreaSizeChanged();
 
   // Overridden from NativeWidget.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
 
   // Overridden from internal::InputMethodDelegate
-  virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
+  virtual bool DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
 
   // A delegate implementation that handles events received here.
   internal::NativeWidgetDelegate* delegate_;
 
   // The following factory is used for calls to close the WidgetWin
   // instance.
   ScopedRunnableMethodFactory<WidgetWin> close_widget_factory_;
 
   // The flags currently being used with TrackMouseEvent to track mouse
   // messages. 0 if there is no active tracking. The value of this member is
@@ skipping 66 matching lines @@
 
   // Indicates if the |input_method_| is an InputMethodWin instance.
   bool is_input_method_win_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_WIN_H_