chrome/browser/chromeos/login/webui_login_display.cc - Issue 12453011: Move InputMethodManager to chromeos/ime

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/webui_login_display.cc

Issue 12453011: Move InputMethodManager to chromeos/ime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 9 months ago

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

Jump to:

Index: chrome/browser/chromeos/login/webui_login_display.cc

diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc

index b80a28eec43964c831ab7b479c10b286f5b736d0..4ea80848b1f6fb4d376a4f8d1387cde5d5dbea62 100644

--- a/chrome/browser/chromeos/login/webui_login_display.cc

+++ b/chrome/browser/chromeos/login/webui_login_display.cc

@@ -7,7 +7,6 @@

#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/input_method/xkeyboard.h"

#include "chrome/browser/chromeos/login/screen_locker.h"

#include "chrome/browser/chromeos/login/wallpaper_manager.h"

@@ -15,6 +14,7 @@

#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 "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"