chrome/browser/chromeos/login/session/user_session_manager.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/chromeos/login/session/user_session_manager.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/chromeos/login/session/user_session_manager.h ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.cc

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

index 5b68bb9e79e8218ee1de6f5dfbbf3c7a3bfb250d..ee137a63f671d94410b5744d6278306e13b7ed4f 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc

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

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

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

#include "chromeos/login/user_names.h"

#include "chromeos/network/portal_detector/network_portal_detector.h"

#include "chromeos/network/portal_detector/network_portal_detector_strategy.h"

@@ -87,7 +88,6 @@

#include "components/user_manager/user_type.h"

#include "content/public/browser/browser_thread.h"

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

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

#include "url/gurl.h"

#if defined(USE_ATHENA)