Listen to XI_HierarchyChanged events and call setxkbmap when needed.

chrome/browser/browser_shutdown.cc

 // Copyright (c) 2011 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 "chrome/browser/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 36 matching lines @@
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/upgrade_util_win.h"
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
+#include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
 namespace browser_shutdown {
 
 // Whether the browser is trying to quit (e.g., Quit chosen from menu).
 bool g_trying_to_quit = false;
 
@@ skipping 57 matching lines @@
   // shutdown.
   base::ThreadRestrictions::SetIOAllowed(true);
 
   // Shutdown the IPC channel to the service processes.
   ServiceProcessControl::GetInstance()->Disconnect();
 
 #if defined(OS_CHROMEOS)
   // The system key event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   chromeos::SystemKeyEventListener::GetInstance()->Stop();
+
+  // TODO(yusukes): Remove the #if once the ARM bot (crbug.com/84694) is fixed.
+#if defined(HAVE_XINPUT2)
+  // The XInput2 event listener needs to be shut down earlier than when
+  // Singletons are finally destroyed in AtExitManager.
+  chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
+#endif
 #endif
 
   // WARNING: During logoff/shutdown (WM_ENDSESSION) we may not have enough
   // time to get here. If you have something that *must* happen on end session,
   // consider putting it in BrowserProcessImpl::EndSession.
   DCHECK(g_browser_process);
 
   // Notifies we are going away.
   g_browser_process->shutdown_event()->Signal();
 
@@ skipping 191 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown