Link LinuxInputMethodContextFactory instead of skipping a call to its SetInstance().

This is a better solution for long term for http://crrev.com/44453003 .

BUG=133476
TEST=none

Review URL: https://codereview.chromium.org/54463009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233534 0039d316-1c4b-4281-b951-d872f2087c98
parent 624cdb8b
...@@ -91,6 +91,10 @@ ...@@ -91,6 +91,10 @@
'sources!': [ 'sources!': [
'input_method_linux_x11.cc', 'input_method_linux_x11.cc',
'input_method_linux_x11.h', 'input_method_linux_x11.h',
],
}],
['use_aura==0 or desktop_linux==0', {
'sources!': [
'linux/fake_input_method_context.cc', 'linux/fake_input_method_context.cc',
'linux/fake_input_method_context.h', 'linux/fake_input_method_context.h',
'linux/fake_input_method_context_factory.cc', 'linux/fake_input_method_context_factory.cc',
......
...@@ -18,9 +18,7 @@ namespace views { ...@@ -18,9 +18,7 @@ namespace views {
void LinuxUI::SetInstance(LinuxUI* instance) { void LinuxUI::SetInstance(LinuxUI* instance) {
delete g_linux_ui; delete g_linux_ui;
g_linux_ui = instance; g_linux_ui = instance;
#if defined(USE_X11)
LinuxInputMethodContextFactory::SetInstance(instance); LinuxInputMethodContextFactory::SetInstance(instance);
#endif
LinuxShellDialog::SetInstance(instance); LinuxShellDialog::SetInstance(instance);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment