IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

ui/aura/root_window.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 UI_AURA_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/cursor.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/events.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
+class InputMethod;
 class LayerAnimationSequence;
 class Transform;
 }
 
 namespace aura {
 
 class RootWindowHost;
 class RootWindowObserver;
 class KeyEvent;
 class MouseEvent;
@@ skipping 18 matching lines @@
   gfx::Point last_mouse_location() const { return last_mouse_location_; }
   gfx::NativeCursor last_cursor() const { return last_cursor_; }
   StackingClient* stacking_client() { return stacking_client_.get(); }
   Window* active_window() { return active_window_; }
   Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
   Window* capture_window() { return capture_window_; }
   ScreenAura* screen() { return screen_; }
 
   void SetStackingClient(StackingClient* stacking_client);
 
+  // Sets the input method for the root window.
+  void SetInputMethod(ui::InputMethod* input_method);

[Ben Goodger (Google), 2011/12/12 16:51:03]

The Shell can actually set this on the RootWindow via a property.

Because you need to access this value from views and content, the property name
can live in src/ui/aura/client/aura_constants.h/cc.

[Yusuke Sato, 2011/12/14 13:42:04]

Done.

+  ui::InputMethod* GetInputMethod() const;
+
   // Shows the root window host.
   void ShowRootWindow();
 
   // Sets the size of the root window.
   void SetHostSize(const gfx::Size& size);
   gfx::Size GetHostSize() const;
 
   // Shows the specified cursor.
   void SetCursor(gfx::NativeCursor cursor);
 
@@ skipping 110 matching lines @@
 
   // Initializes the root window.
   void Init();
 
   // Parses the switch describing the initial size for the host window and
   // returns bounds for the window.
   gfx::Rect GetInitialHostWindowBounds() const;
 
   scoped_refptr<ui::Compositor> compositor_;
 
+  scoped_ptr<ui::InputMethod> input_method_;
+
   scoped_ptr<RootWindowHost> host_;
 
   scoped_ptr<StackingClient> stacking_client_;
 
   static RootWindow* instance_;
 
   // If set before the RootWindow is created, the host window will cover the
   // entire screen.  Note that this can still be overridden via the
   // switches::kAuraHostWindowSize flag.
   static bool use_fullscreen_host_window_;
@@ skipping 28 matching lines @@
   Window* mouse_moved_handler_;
   Window* focused_window_;
   Window* touch_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_