ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc - Issue 1177503003: Remove the 2-level input method system & InputMethodBridge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 1177503003: Remove the 2-level input method system & InputMethodBridge. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reverted changes for MockInputMethod. 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

« ui/views/view.h ('K') | « ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

index 26c9491fca5302e3666d049fad859ea3a8dda2ba..1e7c44e6e5822f9b5ac2e1eb212e135048604d0f 100644

--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

@@ -40,7 +40,6 @@

#include "ui/gfx/screen.h"

#include "ui/native_theme/native_theme.h"

#include "ui/views/corewm/tooltip_aura.h"

-#include "ui/views/ime/input_method.h"

#include "ui/views/linux_ui/linux_ui.h"

#include "ui/views/views_delegate.h"

#include "ui/views/views_switches.h"

@@ -898,12 +897,9 @@ void DesktopWindowTreeHostX11::OnRootViewLayout() {

}

void DesktopWindowTreeHostX11::OnNativeWidgetFocus() {

- native_widget_delegate_->AsWidget()->GetInputMethod()->OnFocus();

}

void DesktopWindowTreeHostX11::OnNativeWidgetBlur() {

- if (xwindow_)

- native_widget_delegate_->AsWidget()->GetInputMethod()->OnBlur();

}

bool DesktopWindowTreeHostX11::IsAnimatingClosed() const {