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

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

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased & removed views::View::GetTextInputClient & removed GetFocusedTextInputClient. Created 5 years, 6 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 5483d015acf38f59223043d66ba7284904ddb031..009ce15549f746c3aa636c6872e0539cb1ebeb25 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1617,10 +1617,6 @@ void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
}
}
-gfx::NativeWindow RenderWidgetHostViewAura::GetAttachedWindow() const {
- return window_;
-}
-
ui::TextInputType RenderWidgetHostViewAura::GetTextInputType() const {
return text_input_type_;
}
@@ -1844,10 +1840,6 @@ void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
GetInputMethod()->OnCaretBoundsChanged(this);
}
-ui::TextInputClient* RenderWidgetHostViewAura::GetFocusedTextInputClient() {
- return GetTextInputClient();
-}
-
gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) {
if (mouse_locked_)
return ui::kCursorNone;
@@ -2688,8 +2680,8 @@ void RenderWidgetHostViewAura::RemovingFromRootWindow() {
void RenderWidgetHostViewAura::DetachFromInputMethod() {
ui::InputMethod* input_method = GetInputMethod();
- if (input_method && input_method->GetTextInputClient() == this)
- input_method->SetFocusedTextInputClient(NULL);
+ if (input_method)
+ input_method->DetachTextInputClient(this);
}
void RenderWidgetHostViewAura::ForwardKeyboardEvent(

Powered by Google App Engine
This is Rietveld 408576698