diff options
Diffstat (limited to 'chrome/browser/chromeos')
21 files changed, 20 insertions, 187 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 7ae26a1..2aeae26 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -40,7 +40,6 @@ #include "chrome/browser/chromeos/external_metrics.h" #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/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" @@ -101,6 +100,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/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "chromeos/login/login_state.h" #include "chromeos/network/geolocation_handler.h" diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index 8f9cc46..58f4243 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -8,11 +8,11 @@ #include "base/values.h" #include "chrome/browser/chromeos/extensions/input_method_event_router.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" +#include "chromeos/ime/input_method_manager.h" namespace { diff --git a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc index 8351cc7..189ece7 100644 --- a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc +++ b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc @@ -8,10 +8,10 @@ #include "base/stringprintf.h" #include "chrome/browser/chromeos/extensions/input_method_event_router.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/extensions/api/test/test_api.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" +#include "chromeos/ime/input_method_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.h b/chrome/browser/chromeos/extensions/input_method_event_router.h index 42dcff1..e0ae8d5 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.h +++ b/chrome/browser/chromeos/extensions/input_method_event_router.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" +#include "chromeos/ime/input_method_manager.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.h b/chrome/browser/chromeos/input_method/browser_state_monitor.h index ba07af0..f82468f 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.h +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" +#include "chromeos/ime/input_method_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc index 79532a1..43935b0 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc @@ -14,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/ibus/ibus_client.h" #include "chromeos/dbus/ibus/ibus_component.h" @@ -26,6 +25,7 @@ #include "chromeos/ime/component_extension_ime_manager.h" #include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/ibus_keymap.h" +#include "chromeos/ime/input_method_manager.h" #include "dbus/object_path.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc index d3723ed..3c5aba9 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus_browserttests.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "chrome/browser/chromeos/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/ibus/mock_ibus_client.h" #include "chromeos/dbus/mock_dbus_thread_manager.h" #include "chromeos/dbus/mock_update_engine_client.h" #include "chromeos/ime/input_method_descriptor.h" +#include "chromeos/ime/input_method_manager.h" #include "dbus/mock_bus.h" // TODO(nona): Remove gmock dependency once crbug.com/223061 is fixed. diff --git a/chrome/browser/chromeos/input_method/input_method_manager.h b/chrome/browser/chromeos/input_method/input_method_manager.h deleted file mode 100644 index e742a2e..0000000 --- a/chrome/browser/chromeos/input_method/input_method_manager.h +++ /dev/null @@ -1,167 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_H_ - -#include <map> -#include <string> -#include <vector> - -#include "base/memory/scoped_ptr.h" -#include "chromeos/ime/input_method_config.h" -#include "chromeos/ime/input_method_descriptor.h" -#include "chromeos/ime/input_method_property.h" - -namespace ui { -class Accelerator; -} // namespace ui - -namespace chromeos { -class ComponentExtensionIMEManager; -class InputMethodEngine; -namespace input_method { - -class InputMethodUtil; -class XKeyboard; - -// This class manages input methodshandles. Classes can add themselves as -// observers. Clients can get an instance of this library class by: -// GetInputMethodManager(). -class InputMethodManager { - public: - enum State { - STATE_LOGIN_SCREEN = 0, - STATE_BROWSER_SCREEN, - STATE_LOCK_SCREEN, - STATE_TERMINATING, - }; - - class Observer { - public: - virtual ~Observer() {} - // Called when the current input method is changed. |show_message| - // indicates whether the user should be notified of this change. - virtual void InputMethodChanged(InputMethodManager* manager, - bool show_message) = 0; - // Called when the list of properties is changed. - virtual void InputMethodPropertyChanged(InputMethodManager* manager) = 0; - }; - - // CandidateWindowObserver is notified of events related to the candidate - // window. The "suggestion window" used by IMEs such as ibus-mozc does not - // count as the candidate window (this may change if we later want suggestion - // window events as well). These events also won't occur when the virtual - // keyboard is used, since it controls its own candidate window. - class CandidateWindowObserver { - public: - virtual ~CandidateWindowObserver() {} - // Called when the candidate window is opened. - virtual void CandidateWindowOpened(InputMethodManager* manager) = 0; - // Called when the candidate window is closed. - virtual void CandidateWindowClosed(InputMethodManager* manager) = 0; - }; - - virtual ~InputMethodManager() {} - - // Adds an observer to receive notifications of input method related - // changes as desribed in the Observer class above. - virtual void AddObserver(Observer* observer) = 0; - virtual void AddCandidateWindowObserver( - CandidateWindowObserver* observer) = 0; - virtual void RemoveObserver(Observer* observer) = 0; - virtual void RemoveCandidateWindowObserver( - CandidateWindowObserver* observer) = 0; - - // Returns all input methods that are supported, including ones not active. - // This function never returns NULL. Note that input method extensions are NOT - // included in the result. - virtual scoped_ptr<InputMethodDescriptors> - GetSupportedInputMethods() const = 0; - - // Returns the list of input methods we can select (i.e. active) including - // extension input methods. - virtual scoped_ptr<InputMethodDescriptors> GetActiveInputMethods() const = 0; - - // Returns the number of active input methods including extension input - // methods. - virtual size_t GetNumActiveInputMethods() const = 0; - - // Changes the current input method to |input_method_id|. If |input_method_id| - // is not active, switch to the first one in the active input method list. - virtual void ChangeInputMethod(const std::string& input_method_id) = 0; - - // Enables keyboard layouts (e.g. US Qwerty, US Dvorak, French Azerty) that - // are necessary for the |language_code| and then switches to |initial_layout| - // if the string is not empty. For example, if |language_code| is "en-US", US - // Qwerty, US International, US Extended, US Dvorak, and US Colemak layouts - // would be enabled. Likewise, for Germany locale, US Qwerty which corresponds - // to the hardware keyboard layout and several keyboard layouts for Germany - // would be enabled. - // This method is for setting up i18n keyboard layouts for the login screen. - virtual void EnableLayouts(const std::string& language_code, - const std::string& initial_layout) = 0; - - // Activates the input method property specified by the |key|. - virtual void ActivateInputMethodProperty(const std::string& key) = 0; - - // Updates the list of active input method IDs, and then starts or stops the - // system input method framework as needed. - virtual bool EnableInputMethods( - const std::vector<std::string>& new_active_input_method_ids) = 0; - - // Updates a configuration of a system input method engine with |value|. - // Returns true if the configuration is correctly set. - virtual bool SetInputMethodConfig(const std::string& section, - const std::string& config_name, - const InputMethodConfigValue& value) = 0; - - // Adds an input method extension. This function does not takes ownership of - // |instance|. - virtual void AddInputMethodExtension(const std::string& id, - const std::string& name, - const std::vector<std::string>& layouts, - const std::string& language, - InputMethodEngine* instance) = 0; - - // Removes an input method extension. - virtual void RemoveInputMethodExtension(const std::string& id) = 0; - - // Returns a list of descriptors for all Input Method Extensions. - virtual void GetInputMethodExtensions(InputMethodDescriptors* result) = 0; - - // Sets the list of extension IME ids which should not be enabled. - virtual void SetFilteredExtensionImes(std::vector<std::string>* ids) = 0; - - // Gets the descriptor of the input method which is currently selected. - virtual InputMethodDescriptor GetCurrentInputMethod() const = 0; - - // Gets the list of input method properties. The list could be empty(). - virtual InputMethodPropertyList GetCurrentInputMethodProperties() const = 0; - - // Returns an X keyboard object which could be used to change the current XKB - // layout, change the caps lock status, and set the auto repeat rate/interval. - virtual XKeyboard* GetXKeyboard() = 0; - - // Returns an InputMethodUtil object. - virtual InputMethodUtil* GetInputMethodUtil() = 0; - - // Returns a ComponentExtentionIMEManager object. - virtual ComponentExtensionIMEManager* GetComponentExtensionIMEManager() = 0; - - // Switches the current input method (or keyboard layout) to the next one. - virtual bool SwitchToNextInputMethod() = 0; - - // Switches the current input method (or keyboard layout) to the previous one. - virtual bool SwitchToPreviousInputMethod() = 0; - - // Switches to an input method (or keyboard layout) which is associated with - // the |accelerator|. - virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) = 0; -}; - -} // namespace input_method -} // namespace chromeos - -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_H_ diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index eba250e..38f4520 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -14,9 +14,9 @@ #include "base/threading/thread_checker.h" #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" #include "chrome/browser/chromeos/input_method/ibus_controller.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chromeos/ime/ibus_daemon_controller.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/input_method_whitelist.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.h b/chrome/browser/chromeos/input_method/input_method_persistence.h index 3935572..9e19921 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.h +++ b/chrome/browser/chromeos/input_method/input_method_persistence.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" +#include "chromeos/ime/input_method_manager.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index 387eef7..a0d9a05 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chromeos/ime/fake_input_method_delegate.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/input_method_whitelist.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.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 bef207c..170184d 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_ -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chromeos/ime/fake_input_method_delegate.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/input_method_whitelist.h" #include "chromeos/ime/mock_xkeyboard.h" diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index 7ba87b3..cd60393 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -12,11 +12,11 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_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/input_method_util.h" #include "chrome/browser/chromeos/login/language_list.h" #include "chrome/browser/chromeos/login/screens/screen_observer.h" #include "chrome/common/pref_names.h" +#include "chromeos/ime/input_method_manager.h" #include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" #include "ui/aura/root_window.h" diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc index c4612c2..744427e 100644 --- a/chrome/browser/chromeos/login/login_display_host_impl.cc +++ b/chrome/browser/chromeos/login/login_display_host_impl.cc @@ -25,7 +25,6 @@ #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/customization_document.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/input_method_util.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/chromeos/language_preferences.h" @@ -53,6 +52,7 @@ #include "chrome/common/pref_names.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/login/login_state.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 77d204c..c1454f2 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -32,7 +32,6 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/chromeos/boot_times_loader.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/input_method_util.h" #include "chrome/browser/chromeos/login/chrome_restart_request.h" #include "chrome/browser/chromeos/login/language_switch_menu.h" @@ -76,6 +75,7 @@ #include "chromeos/cryptohome/cryptohome_library.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" +#include "chromeos/ime/input_method_manager.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/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc index 0db6ce2..d2667d5 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.cc +++ b/chrome/browser/chromeos/login/user_manager_impl.cc @@ -27,7 +27,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cert_library.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/login/login_display.h" #include "chrome/browser/chromeos/login/remove_user_delegate.h" #include "chrome/browser/chromeos/login/user_image_manager_impl.h" @@ -43,6 +42,7 @@ #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" #include "chromeos/cryptohome/async_method_caller.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/login/login_state.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc index 3658916..20f225b 100644 --- a/chrome/browser/chromeos/login/webui_login_display.cc +++ b/chrome/browser/chromeos/login/webui_login_display.cc @@ -7,13 +7,13 @@ #include "ash/wm/user_activity_detector.h" #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/login/login_display_host_impl.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/wallpaper_manager.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/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 38b50ee..f2055cc 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chromeos/accessibility/magnification_manager.h" #include "chrome/browser/chromeos/drive/file_system_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/input_method_util.h" #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/chromeos/login/user_manager.h" @@ -33,6 +32,7 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_policy_controller.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "components/user_prefs/pref_registry_syncable.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index 9cba670..c02ae2e 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -51,7 +51,6 @@ #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/drive/drive_system_service.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/input_method_util.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" @@ -91,6 +90,7 @@ #include "chromeos/dbus/session_manager_client.h" #include "chromeos/dbus/system_clock_client.h" #include "chromeos/ime/extension_ime_util.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "chromeos/login/login_state.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc index d1228fe..1c5a543 100644 --- a/chrome/browser/chromeos/system_key_event_listener.cc +++ b/chrome/browser/chromeos/system_key_event_listener.cc @@ -12,7 +12,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 "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "ui/base/x/x11_util.h" diff --git a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc index e3ae4b9..eba3bdf 100644 --- a/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc +++ b/chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc @@ -8,7 +8,7 @@ #include <X11/extensions/XInput2.h> #include "chrome/browser/chromeos/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" +#include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/xkeyboard.h" #include "ui/base/x/x11_util.h" |