Support for providing IMEContext with Ozone.

ui/base/ime/input_method_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/input_method_factory.h"
 
 #include "base/memory/singleton.h"
 #include "ui/base/ime/mock_input_method.h"
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
 #include "ui/base/ime/input_method_ibus.h"
 #elif defined(OS_WIN)
 #include "base/win/metro.h"
 #include "ui/base/ime/input_method_imm32.h"
 #include "ui/base/ime/input_method_tsf.h"
 #include "ui/base/ime/remote_input_method_win.h"
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)

[Yuki, 2013/12/11 09:31:14]

Better to be defined(USE_AURA) && defined(OS_LINUX).
This shouldn't be applied to other Aura builds.

 #include "ui/base/ime/input_method_auralinux.h"
 #else
 #include "ui/base/ime/input_method_minimal.h"
 #endif
 
 namespace {
 
 ui::InputMethodFactory* g_input_method_factory = NULL;
 
 #if defined(OS_WIN)
@@ skipping 28 matching lines @@
     internal::InputMethodDelegate* delegate,
     gfx::AcceleratedWidget widget) {
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   return scoped_ptr<InputMethod>(new InputMethodIBus(delegate));
 #elif defined(OS_WIN)
   if (base::win::IsTSFAwareRequired())
     return scoped_ptr<InputMethod>(new InputMethodTSF(delegate, widget));
   if (IsRemoteInputMethodWinRequired(widget))
     return CreateRemoteInputMethodWin(delegate);
   return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget));
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)

[Yuki, 2013/12/11 09:31:14]

Ditto.

   return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate));
 #else
   return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate));
 #endif
 }
 
 // MockInputMethodFactory
 
 // static
 MockInputMethodFactory* MockInputMethodFactory::GetInstance() {
@@ skipping 29 matching lines @@
 
 void DestroySharedInputMethod() {
   delete g_shared_input_method;
   g_shared_input_method = NULL;
 }
 
 }  // namespace internal
 #endif
 
 }  // namespace ui