chrome/browser/chromeos/login/ui/login_display_host_impl.cc - Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | chrome/browser/chromeos/login/ui/user_adding_screen_input_methods_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	51 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

52 #include "chrome/common/chrome_constants.h"	52 #include "chrome/common/chrome_constants.h"

53 #include "chrome/common/chrome_switches.h"	53 #include "chrome/common/chrome_switches.h"

54 #include "chrome/common/pref_names.h"	54 #include "chrome/common/pref_names.h"

55 #include "chrome/grit/browser_resources.h"	55 #include "chrome/grit/browser_resources.h"

56 #include "chromeos/audio/chromeos_sounds.h"	56 #include "chromeos/audio/chromeos_sounds.h"

57 #include "chromeos/chromeos_constants.h"	57 #include "chromeos/chromeos_constants.h"

58 #include "chromeos/chromeos_switches.h"	58 #include "chromeos/chromeos_switches.h"

59 #include "chromeos/dbus/dbus_thread_manager.h"	59 #include "chromeos/dbus/dbus_thread_manager.h"

60 #include "chromeos/dbus/session_manager_client.h"	60 #include "chromeos/dbus/session_manager_client.h"

	61 #include "chromeos/ime/extension_ime_util.h"

	62 #include "chromeos/ime/input_method_manager.h"

61 #include "chromeos/login/login_state.h"	63 #include "chromeos/login/login_state.h"

62 #include "chromeos/settings/timezone_settings.h"	64 #include "chromeos/settings/timezone_settings.h"

63 #include "components/session_manager/core/session_manager.h"	65 #include "components/session_manager/core/session_manager.h"

64 #include "components/user_manager/user_manager.h"	66 #include "components/user_manager/user_manager.h"

65 #include "content/public/browser/notification_service.h"	67 #include "content/public/browser/notification_service.h"

66 #include "content/public/browser/notification_types.h"	68 #include "content/public/browser/notification_types.h"

67 #include "content/public/browser/web_contents.h"	69 #include "content/public/browser/web_contents.h"

68 #include "content/public/browser/web_ui.h"	70 #include "content/public/browser/web_ui.h"

69 #include "media/audio/sounds/sounds_manager.h"	71 #include "media/audio/sounds/sounds_manager.h"

70 #include "ui/aura/window.h"	72 #include "ui/aura/window.h"

71 #include "ui/base/ime/chromeos/extension_ime_util.h"

72 #include "ui/base/ime/chromeos/input_method_manager.h"

73 #include "ui/base/resource/resource_bundle.h"	73 #include "ui/base/resource/resource_bundle.h"

74 #include "ui/base/ui_base_switches_util.h"	74 #include "ui/base/ui_base_switches_util.h"

75 #include "ui/compositor/layer.h"	75 #include "ui/compositor/layer.h"

76 #include "ui/compositor/layer_animation_observer.h"	76 #include "ui/compositor/layer_animation_observer.h"

77 #include "ui/compositor/scoped_layer_animation_settings.h"	77 #include "ui/compositor/scoped_layer_animation_settings.h"

78 #include "ui/events/event_utils.h"	78 #include "ui/events/event_utils.h"

79 #include "ui/gfx/display.h"	79 #include "ui/gfx/display.h"

80 #include "ui/gfx/rect.h"	80 #include "ui/gfx/rect.h"

81 #include "ui/gfx/screen.h"	81 #include "ui/gfx/screen.h"

82 #include "ui/gfx/size.h"	82 #include "ui/gfx/size.h"

(...skipping 1219 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1302	1302

1303 locale_util::SwitchLanguageCallback callback(	1303 locale_util::SwitchLanguageCallback callback(

1304 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));	1304 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));

1305	1305

1306 // Load locale keyboards here. Hardware layout would be automatically enabled.	1306 // Load locale keyboards here. Hardware layout would be automatically enabled.

1307 locale_util::SwitchLanguage(	1307 locale_util::SwitchLanguage(

1308 locale, true, true /* login_layouts_only */, callback);	1308 locale, true, true /* login_layouts_only */, callback);

1309 }	1309 }

1310	1310

1311 } // namespace chromeos	1311 } // namespace chromeos

OLD	NEW