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

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 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, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d0a6cdc6afe846284659067738a7145990502e8c..9260f3dc3a24c2534d3d21ee6d06579a986d2985 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -58,6 +58,9 @@

#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"

@@ -70,9 +73,6 @@

#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)