trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc - Issue 238093002: Revert 263726 "x11: Remove X11 message-pump."

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: trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 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:

Index: trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

===================================================================

--- trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc (revision 263732)

+++ trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc (working copy)

@@ -20,7 +20,6 @@

#include "ui/base/ime/composition_text_util_pango.h"

#include "ui/base/ime/text_input_client.h"

#include "ui/events/event.h"

-#include "ui/gfx/x/x11_types.h"

namespace {

@@ -104,7 +103,8 @@

CHECK(delegate_);

{

- XModifierKeymap* keymap = XGetModifierMapping(gfx::GetXDisplay());

+ XModifierKeymap* keymap = XGetModifierMapping(

+ base::MessagePumpForUI::GetDefaultXDisplay());

for (int i = 0; i < 8 * keymap->max_keypermod; ++i) {

if (keymap->modifiermap[i])

modifier_keycodes_.insert(keymap->modifiermap[i]);