Rename input_method_linux_x11 as input_method_auralinux.

Rename input_method_linux_x11 as input_method_auralinux.

This patch renames input_method_linux_x11 and input_method_auralinux.
This would make it possible for it to be used with Ozone.

TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=239329

[Yuki, 2013-12-06 12:55:15]

Could you use *_linux_aura.{cc,h} for the new file names rather than
*_linuxaura.{cc,h}?
Everything else looks okay.

[Yuki, 2013-12-06 13:43:03]

Only a nitpick.

https://codereview.chromium.org/108143003/diff/40001/ui/base/ime/input_method...
File ui/base/ime/input_method_auralinux.h (right):

https://codereview.chromium.org/108143003/diff/40001/ui/base/ime/input_method...
ui/base/ime/input_method_auralinux.h:5: #ifndef
UI_BASE_IME_INPUT_METHOD_AURA_LINUX_H_
Please follow the same style as the filename.
Should be ..._AURALINUX_H_.

https://codereview.chromium.org/108143003/diff/40001/ui/base/ime/input_method...
ui/base/ime/input_method_auralinux.h:61: #endif  //
UI_BASE_IME_INPUT_METHOD_AURA_LINUX_H_
Ditto.

[Yuki, 2013-12-06 14:13:22]

LGTM.  Thanks for working on this.

[commit-bot: I haz the power, 2013-12-06 14:14:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalyan.kondapally@intel.com/108143003/...

[commit-bot: I haz the power, 2013-12-06 14:14:19]

Failed to apply patch for ui/base/ime/input_method_initializer.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/base/ime/input_method_initializer.cc
  Hunk #5 FAILED at 87.
  1 out of 5 hunks FAILED -- saving rejects to file
ui/base/ime/input_method_initializer.cc.rej

Patch:       ui/base/ime/input_method_initializer.cc
Index: ui/base/ime/input_method_initializer.cc
diff --git a/ui/base/ime/input_method_initializer.cc
b/ui/base/ime/input_method_initializer.cc
index
5731a2500565aa60b387f2ee970de0a53c839354..f254b3bbf442e360af17f1f74b3418e16c369f82
100644
--- a/ui/base/ime/input_method_initializer.cc
+++ b/ui/base/ime/input_method_initializer.cc
@@ -10,9 +10,9 @@
 #include "base/logging.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/base/ime/chromeos/ibus_bridge.h"
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/ime/input_method_linux_x11.h"
+#include "ui/base/ime/input_method_auralinux.h"
 #include "ui/base/ime/linux/fake_input_method_context_factory.h"
 #elif defined(OS_WIN)
 #include "base/win/metro.h"
@@ -23,7 +23,7 @@ namespace {
 
 #if defined(OS_CHROMEOS)
 bool dbus_thread_manager_was_initialized = false;
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
 const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
 #endif
 
@@ -34,8 +34,8 @@ namespace ui {
 void InitializeInputMethod() {
 #if defined(OS_CHROMEOS)
   chromeos::IBusBridge::Initialize();
-#elif defined(USE_AURA) && defined(USE_X11)
-  InputMethodLinuxX11::Initialize();
+#elif defined(USE_AURA)
+  InputMethodAuraLinux::Initialize();
 #elif defined(OS_WIN)
   if (base::win::IsTSFAwareRequired())
     TSFBridge::Initialize();
@@ -60,7 +60,7 @@ void InitializeInputMethodForTesting() {
     chromeos::DBusThreadManager::InitializeWithStub();
     dbus_thread_manager_was_initialized = true;
   }
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
   if (!g_linux_input_method_context_factory)
     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
   const LinuxInputMethodContextFactory* factory =
@@ -87,7 +87,7 @@ void ShutdownInputMethodForTesting() {
     chromeos::DBusThreadManager::Shutdown();
     dbus_thread_manager_was_initialized = false;
   }
-#elif defined(USE_AURA) && defined(USE_X11)
+#elif defined(USE_AURA)
   const LinuxInputMethodContextFactory* factory =
       LinuxInputMethodContextFactory::instance();
   CHECK(!factory || factory == g_linux_input_method_context_factory)

[commit-bot: I haz the power, 2013-12-06 17:47:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalyan.kondapally@intel.com/108143003/...

[commit-bot: I haz the power, 2013-12-06 19:35:29]

Retried try job too often on win_x64_rel for step(s) base_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...

[commit-bot: I haz the power, 2013-12-06 20:32:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalyan.kondapally@intel.com/108143003/...

[commit-bot: I haz the power, 2013-12-07 04:20:08]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[commit-bot: I haz the power, 2013-12-07 06:06:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalyan.kondapally@intel.com/108143003/...

[commit-bot: I haz the power, 2013-12-07 06:08:41]

Change committed as 239329

[Eran M. (Google), 2013-12-11 23:30:02]

Hi,

I suspect this change is related to views_examples_with_content_exe not working
anymore. Please advise if the stacktrace below is related:

[1211/232950:WARNING:x11_util.cc(1352)] Smaller than minimum display size
[1211/232950:FATAL:input_method_auralinux.cc(54)] Check failed:
LinuxInputMethodContextFactory::instance().
 [0x0000004f37e4] base::debug::StackTrace::StackTrace()
 [0x00000044d57b] logging::LogMessage::~LogMessage()
 [0x0000005c6852] ui::InputMethodAuraLinux::Init()
 [0x0000006d0914]
views::corewm::InputMethodEventFilter::InputMethodEventFilter()
 [0x0000006a8689]
views::DesktopNativeWidgetAura::InstallInputMethodEventFilter()
 [0x0000006a561f] views::DesktopNativeWidgetAura::InitNativeWidget()
 [0x00000061f34a] views::Widget::Init()
 [0x0000006e57be] views::examples::ShowExamplesWindowWithContent()
 [0x000000427add]
views::examples::ExamplesBrowserMainParts::PreMainMessageLoopRun()
 [0x00000159e01a] content::BrowserMainLoop::PreMainMessageLoopRun()
 [0x0000015a487c] base::internal::RunnableAdapter<>::Run()
 [0x0000015a4700] base::internal::InvokeHelper<>::MakeItSo()
 [0x0000015a4353] base::internal::Invoker<>::Run()
 [0x000000cd4e19] base::Callback<>::Run()
 [0x0000018719ca] content::StartupTaskRunner::RunAllTasksNow()
 [0x00000159d808] content::BrowserMainLoop::CreateStartupTasks()
 [0x0000015a51aa] content::BrowserMainRunnerImpl::Initialize()
 [0x000004518f7f] content::BrowserMain()
 [0x000003f078f3] content::RunNamedProcessTypeMain()
 [0x000003f089ee] content::ContentMainRunnerImpl::Run()
 [0x000003f06cdb] content::ContentMain()
 [0x000000429ca5] main
 [0x7f1a5c65e76d] __libc_start_main
 [0x0000004278a9] <unknown>

[Yuki, 2013-12-12 02:46:11]

On 2013/12/11 23:30:02, eranm wrote:
> Hi,
> 
> I suspect this change is related to views_examples_with_content_exe not
working
> anymore. Please advise if the stacktrace below is related:
> 
> [1211/232950:WARNING:x11_util.cc(1352)] Smaller than minimum display size
> [1211/232950:FATAL:input_method_auralinux.cc(54)] Check failed:
> LinuxInputMethodContextFactory::instance().
>  [0x0000004f37e4] base::debug::StackTrace::StackTrace()
>  [0x00000044d57b] logging::LogMessage::~LogMessage()
>  [0x0000005c6852] ui::InputMethodAuraLinux::Init()
>  [0x0000006d0914]
> views::corewm::InputMethodEventFilter::InputMethodEventFilter()
>  [0x0000006a8689]
> views::DesktopNativeWidgetAura::InstallInputMethodEventFilter()
>  [0x0000006a561f] views::DesktopNativeWidgetAura::InitNativeWidget()
>  [0x00000061f34a] views::Widget::Init()
>  [0x0000006e57be] views::examples::ShowExamplesWindowWithContent()
>  [0x000000427add]
> views::examples::ExamplesBrowserMainParts::PreMainMessageLoopRun()
>  [0x00000159e01a] content::BrowserMainLoop::PreMainMessageLoopRun()
>  [0x0000015a487c] base::internal::RunnableAdapter<>::Run()
>  [0x0000015a4700] base::internal::InvokeHelper<>::MakeItSo()
>  [0x0000015a4353] base::internal::Invoker<>::Run()
>  [0x000000cd4e19] base::Callback<>::Run()
>  [0x0000018719ca] content::StartupTaskRunner::RunAllTasksNow()
>  [0x00000159d808] content::BrowserMainLoop::CreateStartupTasks()
>  [0x0000015a51aa] content::BrowserMainRunnerImpl::Initialize()
>  [0x000004518f7f] content::BrowserMain()
>  [0x000003f078f3] content::RunNamedProcessTypeMain()
>  [0x000003f089ee] content::ContentMainRunnerImpl::Run()
>  [0x000003f06cdb] content::ContentMain()
>  [0x000000429ca5] main
>  [0x7f1a5c65e76d] __libc_start_main
>  [0x0000004278a9] <unknown>

I don't think this CL itself is not directly related to the crash.

The cause of the crash is that you haven't called either of
ui::InitializeInputMethod (for production) or
ui::InitializeInputMethodForTesting (for testing).  Please call one of them
before any use of ui::InputMethod, but not both of them.

You see how it's called:
https://code.google.com/p/chromium/codesearch#search/&q=InitializeInputMethod...

[Yuki, 2013-12-12 02:47:07]

On 2013/12/12 02:46:11, Yuki wrote:
> On 2013/12/11 23:30:02, eranm wrote:
> > Hi,
> > 
> > I suspect this change is related to views_examples_with_content_exe not
> working
> > anymore. Please advise if the stacktrace below is related:
> > 
> > [1211/232950:WARNING:x11_util.cc(1352)] Smaller than minimum display size
> > [1211/232950:FATAL:input_method_auralinux.cc(54)] Check failed:
> > LinuxInputMethodContextFactory::instance().
> >  [0x0000004f37e4] base::debug::StackTrace::StackTrace()
> >  [0x00000044d57b] logging::LogMessage::~LogMessage()
> >  [0x0000005c6852] ui::InputMethodAuraLinux::Init()
> >  [0x0000006d0914]
> > views::corewm::InputMethodEventFilter::InputMethodEventFilter()
> >  [0x0000006a8689]
> > views::DesktopNativeWidgetAura::InstallInputMethodEventFilter()
> >  [0x0000006a561f] views::DesktopNativeWidgetAura::InitNativeWidget()
> >  [0x00000061f34a] views::Widget::Init()
> >  [0x0000006e57be] views::examples::ShowExamplesWindowWithContent()
> >  [0x000000427add]
> > views::examples::ExamplesBrowserMainParts::PreMainMessageLoopRun()
> >  [0x00000159e01a] content::BrowserMainLoop::PreMainMessageLoopRun()
> >  [0x0000015a487c] base::internal::RunnableAdapter<>::Run()
> >  [0x0000015a4700] base::internal::InvokeHelper<>::MakeItSo()
> >  [0x0000015a4353] base::internal::Invoker<>::Run()
> >  [0x000000cd4e19] base::Callback<>::Run()
> >  [0x0000018719ca] content::StartupTaskRunner::RunAllTasksNow()
> >  [0x00000159d808] content::BrowserMainLoop::CreateStartupTasks()
> >  [0x0000015a51aa] content::BrowserMainRunnerImpl::Initialize()
> >  [0x000004518f7f] content::BrowserMain()
> >  [0x000003f078f3] content::RunNamedProcessTypeMain()
> >  [0x000003f089ee] content::ContentMainRunnerImpl::Run()
> >  [0x000003f06cdb] content::ContentMain()
> >  [0x000000429ca5] main
> >  [0x7f1a5c65e76d] __libc_start_main
> >  [0x0000004278a9] <unknown>
> 
> I don't think this CL itself is not directly related to the crash.
> 
> The cause of the crash is that you haven't called either of
> ui::InitializeInputMethod (for production) or
> ui::InitializeInputMethodForTesting (for testing).  Please call one of them
> before any use of ui::InputMethod, but not both of them.
> 
> You see how it's called:
>
https://code.google.com/p/chromium/codesearch#search/&q=InitializeInputMethod...

Sorry, I wanted to say
"I don't think this CL itself is directly related to the crash."

[Eran M. (Google), 2013-12-12 10:46:58]

Just noticed this is a refactoring CL, without functional changes.

Fixed according to your comments in https://codereview.chromium.org/113783003.