Refactoring the ownership of ui::InputMethod.

mandoline/ui/aura/native_widget_view_manager.cc

 // Copyright 2015 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 "mandoline/ui/aura/native_widget_view_manager.h"
 
 #include "mandoline/ui/aura/input_method_mandoline.h"
 #include "mandoline/ui/aura/window_tree_host_mojo.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/focus_controller.h"
 
 namespace mandoline {
 namespace {
 
 // TODO: figure out what this should be.
 class FocusRulesImpl : public wm::BaseFocusRules {
  public:
   FocusRulesImpl() {}
   ~FocusRulesImpl() override {}
 
   bool SupportsChildActivation(aura::Window* window) const override {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FocusRulesImpl);
 };
 
-class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
-                                public ui::EventHandler {
- public:
-  explicit MinimalInputEventFilter(aura::Window* root)
-      : root_(root) {
-    input_method_.reset(new InputMethodMandoline(this));
-    input_method_->OnFocus();
-    root_->AddPreTargetHandler(this);
-    root_->SetProperty(aura::client::kRootWindowInputMethodKey,
-                       input_method_.get());
-  }
-
-  ~MinimalInputEventFilter() override {
-    root_->RemovePreTargetHandler(this);
-    root_->SetProperty(aura::client::kRootWindowInputMethodKey,
-                       static_cast<ui::InputMethod*>(NULL));
-  }
-
- private:
-  // ui::EventHandler:
-  void OnKeyEvent(ui::KeyEvent* event) override {
-    // See the comment in InputMethodEventFilter::OnKeyEvent() for details.
-    if (event->IsTranslated()) {
-      event->SetTranslated(false);
-    } else {
-      if (input_method_->DispatchKeyEvent(*event))
-        event->StopPropagation();
-    }
-  }
-
-  // ui::internal::InputMethodDelegate:
-  bool DispatchKeyEventPostIME(const ui::KeyEvent& event) override {
-    // See the comment in InputMethodEventFilter::DispatchKeyEventPostIME() for
-    // details.
-    ui::KeyEvent aura_event(event);
-    aura_event.SetTranslated(true);
-    ui::EventDispatchDetails details =
-        root_->GetHost()->dispatcher()->OnEventFromSource(&aura_event);
-    return aura_event.handled() || details.dispatcher_destroyed;
-  }
-
-  aura::Window* root_;
-  scoped_ptr<ui::InputMethod> input_method_;
-
-  DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter);
-};
-
 }  // namespace
 
 NativeWidgetViewManager::NativeWidgetViewManager(
     views::internal::NativeWidgetDelegate* delegate,
     mojo::Shell* shell,
     mojo::View* view)
     : NativeWidgetAura(delegate), view_(view) {
   view_->AddObserver(this);
   window_tree_host_.reset(new WindowTreeHostMojo(shell, view_));
   window_tree_host_->InitHost();
 
-  ime_filter_.reset(
-      new MinimalInputEventFilter(window_tree_host_->window()));
-
   focus_client_.reset(new wm::FocusController(new FocusRulesImpl));
 
   aura::client::SetFocusClient(window_tree_host_->window(),
                                focus_client_.get());
   aura::client::SetActivationClient(window_tree_host_->window(),
                                     focus_client_.get());
   window_tree_host_->window()->AddPreTargetHandler(focus_client_.get());
 
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(window_tree_host_->window()));
@@ skipping 36 matching lines @@
 }
 
 void NativeWidgetViewManager::OnViewInputEvent(mojo::View* view,
                                                const mojo::EventPtr& event) {
   scoped_ptr<ui::Event> ui_event(event.To<scoped_ptr<ui::Event> >());
   if (ui_event)
     window_tree_host_->SendEventToProcessor(ui_event.get());
 }
 
 }  // namespace mandoline