Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(866)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pls be green! Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 563c91fef0538083ec3ac7d4b6f08cd097a4ed45..8544bc705336e759eb2128fad8f312d80b7aa496 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -2467,7 +2467,8 @@ ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() const {
aura::Window* root_window = window_->GetRootWindow();
if (!root_window)
return NULL;
- return root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
+ return root_window->GetHost()->GetInputMethod();
+ //return root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
Avi (use Gerrit) 2015/06/01 15:13:39 don't commit commented-out code
Shu Chen 2015/06/02 04:11:16 Done.
}
void RenderWidgetHostViewAura::Shutdown() {

Powered by Google App Engine
This is Rietveld 408576698