chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc - Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method 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/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 12672008: Move xkeyboard.cc from c/b/chromeos/input_method 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/ui/webui/chromeos/login/signin_screen_handler.cc

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 e6d12396c25f21927679a810e61a87b0440fd75a..9ab2c5be9fefa0654898d09ff3a63a6826f138aa 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"