diff options
Diffstat (limited to 'chrome/browser/ui/webui/chromeos')
10 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index d868c5c..60b3aa0 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -19,8 +19,6 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h" -#include "chromeos/ime/ime_keyboard.h" -#include "chromeos/ime/input_method_manager.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" @@ -28,6 +26,8 @@ #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" +#include "ui/base/ime/chromeos/ime_keyboard.h" +#include "ui/base/ime/chromeos/input_method_manager.h" using chromeos::input_method::ModifierKey; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc index 2ef2b7c..94dd126 100644 --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc @@ -25,7 +25,6 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h" -#include "chromeos/ime/input_method_manager.h" #include "chromeos/settings/cros_settings_names.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" @@ -33,6 +32,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_switches.h" #include "google_apis/gaia/gaia_urls.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc index 1613b4d..621481d1 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc @@ -29,10 +29,10 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/input_method_descriptor.h" -#include "chromeos/ime/input_method_manager.h" #include "content/public/browser/browser_thread.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h b/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h index 26d1882..26f8e87 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" -#include "chromeos/ime/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc index 4ddbe77..b0e2175 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc @@ -14,9 +14,9 @@ #include "chrome/browser/chromeos/customization_document.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h" -#include "chromeos/ime/component_extension_ime_manager.h" #include "chromeos/system/statistics_provider.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc index 1409534..90c5756 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc @@ -28,11 +28,11 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "chromeos/chromeos_switches.h" -#include "chromeos/ime/extension_ime_util.h" #include "chromeos/network/network_handler.h" #include "chromeos/network/network_state_handler.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" #include "ui/views/layout/fill_layout.h" diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h index 4b18c1c..ea3941b 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h @@ -13,8 +13,8 @@ #include "chrome/browser/chromeos/login/screens/network_screen_actor.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/input_method_manager.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/gfx/point.h" namespace chromeos { 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 9260f3d..d0a6cdc 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -58,9 +58,6 @@ #include "chrome/grit/generated_resources.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" -#include "chromeos/ime/ime_keyboard.h" -#include "chromeos/ime/input_method_descriptor.h" -#include "chromeos/ime/input_method_manager.h" #include "chromeos/login/auth/key.h" #include "chromeos/login/auth/user_context.h" #include "chromeos/network/network_state.h" @@ -73,6 +70,9 @@ #include "content/public/browser/web_contents.h" #include "google_apis/gaia/gaia_auth_util.h" #include "third_party/cros_system_api/dbus/service_constants.h" +#include "ui/base/ime/chromeos/ime_keyboard.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/webui/web_ui_util.h" #if !defined(USE_ATHENA) diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index e1bd26a..2aa35fd 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -27,14 +27,14 @@ #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" #include "chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h" -#include "chromeos/ime/ime_keyboard.h" -#include "chromeos/ime/input_method_manager.h" #include "chromeos/network/portal_detector/network_portal_detector.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui.h" #include "net/base/net_errors.h" +#include "ui/base/ime/chromeos/ime_keyboard.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/events/event_handler.h" class EasyUnlockService; diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc index e231e2e..02c0196 100644 --- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc @@ -22,10 +22,10 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/ime/input_method_manager.h" #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/web_ui.h" +#include "ui/base/ime/chromeos/input_method_manager.h" namespace { |