ui/base/ime/input_method_factory.cc - Issue 166063002: Unify InputMethodIMM32 into InputMethodWin again

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 166063002: Unify InputMethodIMM32 into InputMethodWin again (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 6 years, 10 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: 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 b29f61600fd79e96f8fce5821ea1b873cf202c1c..07153b3e20cdeed9289e53cb53f29555649fe742 100644

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

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

@@ -10,7 +10,7 @@

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

#elif defined(OS_WIN)

#include "base/win/metro.h"

-#include "ui/base/ime/input_method_imm32.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)

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

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

#elif defined(OS_WIN)

if (IsRemoteInputMethodWinRequired(widget))

return CreateRemoteInputMethodWin(delegate);

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

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

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

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

#else

« no previous file with comments | « ui/base/ime/ime.gypi ('k') | ui/base/ime/input_method_imm32.h » ('j') | no next file with comments »