Integrate the new input method API for Views into Chromium.

views/widget/widget.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_H_
 #define VIEWS_WIDGET_WIDGET_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 15 matching lines @@
 class Accelerator;
 class Compositor;
 class OSExchangeData;
 class ThemeProvider;
 }
 using ui::ThemeProvider;
 
 namespace views {
 
 class DefaultThemeProvider;
+class InputMethod;
 class NativeWidget;
 class RootView;
 class TooltipManager;
 class View;
 class WidgetDelegate;
 class Window;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget class
 //
@@ skipping 158 matching lines @@
   bool IsAccessibleWidget() const;
 
   // Returns the ThemeProvider that provides theme resources for this Widget.
   virtual ThemeProvider* GetThemeProvider() const;
 
   // Returns the FocusManager for this widget.
   // Note that all widgets in a widget hierarchy share the same focus manager.
   // TODO(beng): remove virtual.
   virtual FocusManager* GetFocusManager();
 
+  // Returns the InputMethod for this widget.
+  // Note that all widgets in a widget hierarchy share the same input method.
+  InputMethod* GetInputMethod() const;
+
   // Returns true if the native view |native_view| is contained in the
   // views::View hierarchy rooted at this widget.
   // TODO(beng): const.
   bool ContainsNativeView(gfx::NativeView native_view);
 
   // Starts a drag operation for the specified view. This blocks until the drag
   // operation completes. |view| can be NULL.
   // If the view is non-NULL it can be accessed during the drag by calling
   // dragged_view(). If the view has not been deleted during the drag,
   // OnDragDone() is called on it.
@@ skipping 29 matching lines @@
   // occurred on |view|, such as when the view is focused or when its
   // value changes. Pass true for |send_native_event| except for rare
   // cases where the view is a native control that's already sending a
   // native accessibility event and the duplicate event would cause
   // problems.
   virtual void NotifyAccessibilityEvent(
       View* view,
       ui::AccessibilityTypes::Event event_type,
       bool send_native_event) = 0;
 
-  NativeWidget* native_widget() { return native_widget_; }
+  NativeWidget* native_widget() const { return native_widget_; }
 
   // Overridden from NativeWidgetDelegate:
   virtual void OnNativeFocus(gfx::NativeView focused_view) OVERRIDE;
   virtual void OnNativeBlur(gfx::NativeView focused_view) OVERRIDE;
   virtual void OnNativeWidgetCreated() OVERRIDE;
   virtual void OnSizeChanged(const gfx::Size& new_size) OVERRIDE;
   virtual bool HasFocusManager() const OVERRIDE;
   virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from FocusTraversable:
@@ skipping 56 matching lines @@
 
   // The compositor for accelerated drawing.
   scoped_refptr<ui::Compositor> compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_WIDGET_H_