Routing IME Result Calls to the Correct RenderWidgetHost (Aura Only)

content/browser/renderer_host/text_input_manager.cc

 // Copyright 2016 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 "content/browser/renderer_host/text_input_manager.h"
 
+#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 
 namespace content {
 
 namespace {
 
 bool AreDifferentTextInputStates(const content::TextInputState& old_state,
                                  const content::TextInputState& new_state) {
 #if defined(USE_AURA)
   return old_state.type != new_state.type || old_state.mode != new_state.mode ||
@@ skipping 23 matching lines @@
     views.push_back(pair.first);
 
   for (auto view : views)
     Unregister(view);
 }
 
 const TextInputState* TextInputManager::GetTextInputState() {
   return !!active_view_ ? &text_input_state_map_[active_view_] : nullptr;
 }
 
-RenderWidgetHostViewBase* TextInputManager::GetActiveView() const {
-  return active_view_;
+RenderWidgetHostImpl* TextInputManager::GetActiveWidget() const {
+  return !!active_view_ ? static_cast<RenderWidgetHostImpl*>(
+                              active_view_->GetRenderWidgetHost())
+                        : nullptr;
 }
 
 void TextInputManager::UpdateTextInputState(
     RenderWidgetHostViewBase* view,
     const TextInputState& text_input_state) {
   DCHECK(IsRegistered(view));
 
   // Since |view| is registgered, we already have a previous value for its
   // TextInputState.
   bool changed = AreDifferentTextInputStates(text_input_state_map_[view],
@@ skipping 44 matching lines @@
 
 void TextInputManager::NotifyObserversAboutInputStateUpdate(
     RenderWidgetHostViewBase* updated_view,
     bool did_update_state) {
   FOR_EACH_OBSERVER(
       Observer, observer_list_,
       OnUpdateTextInputStateCalled(this, updated_view, did_update_state));
 }
 
 }  // namespace content