Move xkeyboard.cc from c/b/chromeos/input_method to chromeos/ime

BUG=164375
TEST=None
TBR=sky


Review URL: https://chromiumcodereview.appspot.com/12672008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191535 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 45 insertions, 42 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 2afef4e..ee52030 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -38,7 +38,6 @@
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
@@ -93,6 +92,7 @@
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "chromeos/network/geolocation_handler.h"
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
index 3010dcf..d00e19c 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -12,12 +12,12 @@
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_delegate.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "ui/base/accelerators/accelerator.h"
 
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
index 12e7574..3bd2a0c 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc
@@ -13,13 +13,13 @@
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h"
-#include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/mock_ibus_daemon_controller.h"
 #include "chromeos/ime/mock_input_method_delegate.h"
+#include "chromeos/ime/mock_xkeyboard.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/ime/text_input_test_support.h"
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
index f0b48ef..4f678de 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
@@ -7,9 +7,9 @@
 
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
 #include "chromeos/ime/input_method_whitelist.h"
 #include "chromeos/ime/mock_input_method_delegate.h"
+#include "chromeos/ime/mock_xkeyboard.h"
 
 namespace chromeos {
 namespace input_method {
diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc
index 5e633a4..c1b9c81 100644
--- a/chrome/browser/chromeos/login/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/webui_login_display.cc
@@ -8,13 +8,13 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 9233373..d8fe830 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/drm_settings.h"
@@ -34,6 +33,7 @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_policy_controller.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/icu/public/i18n/unicode/timezone.h"
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 5a4233d..f78c66c 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -52,7 +52,6 @@
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
@@ -89,6 +88,7 @@
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/system_clock_client.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 3cfcbab..d1228fe 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -13,7 +13,7 @@
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "ui/base/x/x11_util.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
index bd48f83..e3ae4b9 100644
--- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
+++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc
@@ -9,7 +9,7 @@
 
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "ui/base/x/x11_util.h"
 
 namespace chromeos {
diff --git a/chrome/browser/ui/ash/caps_lock_delegate_chromeos.cc b/chrome/browser/ui/ash/caps_lock_delegate_chromeos.cc
index 5297049..a58fab8 100644
--- a/chrome/browser/ui/ash/caps_lock_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/caps_lock_delegate_chromeos.cc
@@ -7,8 +7,8 @@
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "content/public/browser/browser_thread.h"
 
 CapsLockDelegate::CapsLockDelegate(chromeos::input_method::XKeyboard* xkeyboard)
diff --git a/chrome/browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc b/chrome/browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc
index 5205b53..4433406 100644
--- a/chrome/browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc
+++ b/chrome/browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"
 
-#include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "chromeos/ime/mock_xkeyboard.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/ash/event_rewriter.cc b/chrome/browser/ui/ash/event_rewriter.cc
index e15ae68..dcca61e 100644
--- a/chrome/browser/ui/ash/event_rewriter.cc
+++ b/chrome/browser/ui/ash/event_rewriter.cc
@@ -29,12 +29,12 @@
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/x/x11_util.h"
 
diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc
index 921e8af..ef68ad7 100644
--- a/chrome/browser/ui/ash/event_rewriter_unittest.cc
+++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc
@@ -21,9 +21,9 @@
 
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/mock_xkeyboard.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
+#include "chromeos/ime/mock_xkeyboard.h"
 #include "ui/base/x/x11_util.h"
 
 namespace {
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 909645d..50718b2 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -15,11 +15,11 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index e6d1239..9ab2c5b 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -23,7 +23,6 @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/error_screen_actor.h"
@@ -48,6 +47,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_auth_util.h"
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
index f88e089..24b8e01 100644
--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/common/chrome_switches.h"
+#include "chromeos/ime/xkeyboard.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index d8d516a..fbf74af8a 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -351,8 +351,6 @@
         'browser/chromeos/input_method/component_extension_ime_manager_impl.h',
         'browser/chromeos/input_method/mock_ibus_controller.cc',
         'browser/chromeos/input_method/mock_ibus_controller.h',
-        'browser/chromeos/input_method/xkeyboard.cc',
-        'browser/chromeos/input_method/xkeyboard.h',
         'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc',
         'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h',
         'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index c77eaa9..d45f49e 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -76,8 +76,6 @@
         'browser/chromeos/input_method/mock_candidate_window_controller.h',
         'browser/chromeos/input_method/mock_input_method_manager.cc',
         'browser/chromeos/input_method/mock_input_method_manager.h',
-        'browser/chromeos/input_method/mock_xkeyboard.cc',
-        'browser/chromeos/input_method/mock_xkeyboard.h',
         'browser/chromeos/login/mock_login_display.cc',
         'browser/chromeos/login/mock_login_display.h',
         'browser/chromeos/login/mock_login_display_host.cc',
@@ -601,7 +599,6 @@
         'browser/chromeos/input_method/input_method_manager_impl_unittest.cc',
         'browser/chromeos/input_method/input_method_persistence_unittest.cc',
         'browser/chromeos/input_method/input_method_util_unittest.cc',
-        'browser/chromeos/input_method/xkeyboard_unittest.cc',
         'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc',
         'browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc',
         'browser/chromeos/language_preferences_unittest.cc',
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index fc145e9..9b804fc 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -174,6 +174,8 @@
         'ime/input_method_property.h',
         'ime/input_method_whitelist.cc',
         'ime/input_method_whitelist.h',
+        'ime/xkeyboard.cc',
+        'ime/xkeyboard.h',
         'network/cros_network_functions.cc',
         'network/cros_network_functions.h',
         'network/device_state.cc',
@@ -367,6 +369,8 @@
         'ime/mock_ibus_daemon_controller.h',
         'ime/mock_input_method_delegate.cc',
         'ime/mock_input_method_delegate.h',
+        'ime/mock_xkeyboard.cc',
+        'ime/mock_xkeyboard.h',
       ],
       'include_dirs': [
         '..',
@@ -420,6 +424,7 @@
         'ime/input_method_descriptor_unittest.cc',
         'ime/input_method_property_unittest.cc',
         'ime/input_method_whitelist_unittest.cc',
+        'ime/xkeyboard_unittest.cc',
         'network/cros_network_functions_unittest.cc',
         'network/geolocation_handler_unittest.cc',
         'network/network_change_notifier_chromeos_unittest.cc',
diff --git a/chrome/browser/chromeos/input_method/mock_xkeyboard.cc b/chromeos/ime/mock_xkeyboard.cc
index 6c5d59f..a4a2f72 100644
--- a/chrome/browser/chromeos/input_method/mock_xkeyboard.cc
+++ b/chromeos/ime/mock_xkeyboard.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/chromeos/input_method/mock_xkeyboard.h"
+#include "chromeos/ime/mock_xkeyboard.h"
 
 namespace chromeos {
 namespace input_method {
diff --git a/chrome/browser/chromeos/input_method/mock_xkeyboard.h b/chromeos/ime/mock_xkeyboard.h
index 30050b7f..5c9ea2b 100644
--- a/chrome/browser/chromeos/input_method/mock_xkeyboard.h
+++ b/chromeos/ime/mock_xkeyboard.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_XKEYBOARD_H_
-#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_XKEYBOARD_H_
+#ifndef CHROMEOS_IME_MOCK_XKEYBOARD_H_
+#define CHROMEOS_IME_MOCK_XKEYBOARD_H_
 
-#include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chromeos/ime/xkeyboard.h"
 
 #include <string>
 
@@ -47,4 +47,4 @@ class MockXKeyboard : public XKeyboard {
 }  // namespace input_method
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_XKEYBOARD_H_
+#endif  // CHROMEOS_IME_MOCK_XKEYBOARD_H_
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chromeos/ime/xkeyboard.cc
index 93c2663..222b07d 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.cc
+++ b/chromeos/ime/xkeyboard.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/chromeos/input_method/xkeyboard.h"
+#include "chromeos/ime/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.h b/chromeos/ime/xkeyboard.h
index d5d4245..fc177a2 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard.h
+++ b/chromeos/ime/xkeyboard.h
@@ -1,14 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_
-#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_
+#ifndef CHROMEOS_IME_XKEYBOARD_H_
+#define CHROMEOS_IME_XKEYBOARD_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 namespace input_method {
@@ -38,7 +39,7 @@ enum ModifierKey {
 
 class InputMethodUtil;
 
-class XKeyboard {
+class CHROMEOS_EXPORT XKeyboard {
  public:
   virtual ~XKeyboard() {}
 
@@ -100,24 +101,26 @@ class XKeyboard {
   // Turns on and off the auto-repeat of the keyboard. Returns true on success.
   // Do not call the function from non-UI threads.
   // TODO(yusukes): Make this function non-static so we can mock it.
-  static bool SetAutoRepeatEnabled(bool enabled);
+  static CHROMEOS_EXPORT bool SetAutoRepeatEnabled(bool enabled);
 
   // Sets the auto-repeat rate of the keyboard, initial delay in ms, and repeat
   // interval in ms.  Returns true on success. Do not call the function from
   // non-UI threads.
   // TODO(yusukes): Make this function non-static so we can mock it.
-  static bool SetAutoRepeatRate(const AutoRepeatRate& rate);
+  static CHROMEOS_EXPORT bool SetAutoRepeatRate(const AutoRepeatRate& rate);
 
   // Returns true if auto repeat is enabled. This function is protected: for
   // testability.
-  static bool GetAutoRepeatEnabledForTesting();
+  static CHROMEOS_EXPORT bool GetAutoRepeatEnabledForTesting();
 
   // On success, set current auto repeat rate on |out_rate| and returns true.
   // Returns false otherwise. This function is protected: for testability.
-  static bool GetAutoRepeatRateForTesting(AutoRepeatRate* out_rate);
+  static CHROMEOS_EXPORT bool GetAutoRepeatRateForTesting(
+      AutoRepeatRate* out_rate);
 
   // Returns false if |layout_name| contains a bad character.
-  static bool CheckLayoutNameForTesting(const std::string& layout_name);
+  static CHROMEOS_EXPORT bool CheckLayoutNameForTesting(
+      const std::string& layout_name);
 
   // Note: At this moment, classes other than InputMethodManager should not
   // instantiate the XKeyboard class.
@@ -127,4 +130,4 @@ class XKeyboard {
 }  // namespace input_method
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_H_
+#endif  // CHROMEOS_IME_XKEYBOARD_H_
diff --git a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc b/chromeos/ime/xkeyboard_unittest.cc
index cbf6440..6048c4c 100644
--- a/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc
+++ b/chromeos/ime/xkeyboard_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/chromeos/input_method/xkeyboard.h"
+#include "chromeos/ime/xkeyboard.h"
 
 #include <algorithm>
 #include <set>