ui/base/ime/input_method_factory.cc - Issue 284323002: ozone: Remove InputMethodContextFactoryOzone and FakeInputMethodContextOzone.

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/base/ime/input_method_factory.cc

Issue 284323002: ozone: Remove InputMethodContextFactoryOzone and FakeInputMethodContextOzone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge Created 6 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: ui/base/ime/input_method_factory.cc

diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc

index 07153b3e20cdeed9289e53cb53f29555649fe742..6d2a26cb5806495b46e0ff662149d10cfb4bcd4f 100644

--- a/ui/base/ime/input_method_factory.cc

+++ b/ui/base/ime/input_method_factory.cc

@@ -12,7 +12,7 @@

#include "base/win/metro.h"

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

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

-#elif defined(USE_AURA) && defined(OS_LINUX)

+#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)

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

#else

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

@@ -43,7 +43,7 @@ scoped_ptr<InputMethod> CreateInputMethod(

if (IsRemoteInputMethodWinRequired(widget))

return CreateRemoteInputMethodWin(delegate);

return scoped_ptr<InputMethod>(new InputMethodWin(delegate, widget));

-#elif defined(USE_AURA) && defined(OS_LINUX)

+#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)

return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));

#else

return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));

« no previous file with comments | « content/public/test/content_browser_test.cc ('k') | ui/base/ime/input_method_initializer.cc » ('j') | no next file with comments »