AppShell: Create input method and handle key events

extensions/shell/browser/shell_desktop_controller_aura.h

 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "extensions/shell/browser/desktop_controller.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/window_tree_host_observer.h"
+#include "ui/base/ime/input_method_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/display/manager/chromeos/display_configurator.h"
 #endif
 
 namespace aura {
 class Window;
 class WindowTreeHost;
 namespace client {
 class DefaultCaptureClient;
 class FocusClient;
 }
 }
 
 namespace content {
 class BrowserContext;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
+class InputMethod;
 class UserActivityDetector;
 #if defined(OS_CHROMEOS)
 class UserActivityPowerManagerNotifier;
 #endif
 }
 
 namespace wm {
 class CompoundEventFilter;
 class CursorManager;
 }
 
 namespace extensions {
 class AppWindowClient;
 class Extension;
+class InputMethodEventHandler;
 class ShellScreen;
 
 // Handles desktop-related tasks for app_shell.
 class ShellDesktopControllerAura
     : public DesktopController,
       public aura::client::WindowParentingClient,
 #if defined(OS_CHROMEOS)
       public chromeos::PowerManagerClient::Observer,
       public ui::DisplayConfigurator::Observer,
 #endif
-      public aura::WindowTreeHostObserver {
+      public aura::WindowTreeHostObserver,
+      public ui::internal::InputMethodDelegate {
  public:
   ShellDesktopControllerAura();
   ~ShellDesktopControllerAura() override;
 
   // DesktopController:
   gfx::Size GetWindowSize() override;
   AppWindow* CreateAppWindow(content::BrowserContext* context,
                              const Extension* extension) override;
   void AddAppWindow(gfx::NativeWindow window) override;
   void RemoveAppWindow(AppWindow* window) override;
@@ skipping 10 matching lines @@
                                 const base::TimeTicks& timestamp) override;
 
   // ui::DisplayConfigurator::Observer overrides.
   void OnDisplayModeChanged(
       const ui::DisplayConfigurator::DisplayStateList& displays) override;
 #endif
 
   // aura::WindowTreeHostObserver overrides:
   void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
 
+  // ui::internal::InputMethodDelegate overrides:
+  ui::EventDispatchDetails DispatchKeyEventPostIME(
+      ui::KeyEvent* key_event) override;
+
  protected:
   // Creates and sets the aura clients and window manager stuff. Subclass may
   // initialize different sets of the clients.
   virtual void InitWindowManager();
 
  private:
   // Creates the window that hosts the app.
   void CreateRootWindow();
 
   // Closes and destroys the root window hosting the app.
   void DestroyRootWindow();
 
   // Returns the dimensions (in pixels) of the primary display, or an empty size
   // if the dimensions can't be determined or no display is connected.
   gfx::Size GetPrimaryDisplaySize();
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
 #endif
 
   std::unique_ptr<ShellScreen> screen_;
 
   std::unique_ptr<aura::WindowTreeHost> host_;
 
   std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_;
 

[Rahul Chaturvedi, 2016/12/15 22:42:46]

nit: Add a comment here that input_method_ needs to outlive
input_method_event_handler_, hence the order of these declarations should not be
changed.

[michaelpg, 2016/12/15 23:55:52]

Removed input_method_.

+  std::unique_ptr<ui::InputMethod> input_method_;
+

[Rahul Chaturvedi, 2016/12/15 22:42:46]

nit: remove line, so these two are grouped together.

[michaelpg, 2016/12/15 23:55:52]

Acknowledged.

+  std::unique_ptr<InputMethodEventHandler> input_method_event_handler_;
+
   std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   std::unique_ptr<aura::client::FocusClient> focus_client_;
 
   std::unique_ptr<wm::CursorManager> cursor_manager_;
 
   std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
 #if defined(OS_CHROMEOS)
   std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 #endif
 
   std::unique_ptr<AppWindowClient> app_window_client_;
 
   // NativeAppWindow::Close() deletes the AppWindow.
   std::vector<AppWindow*> app_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_