chrome/browser/ui/ash/chrome_shell_delegate_chromeos.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/ui/ash/chrome_shell_delegate_chromeos.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/ui/ash/chrome_shell_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

index 176836406c07003bda3ff6dbbf5c1817a995fe4a..e98c5b684563f8f33e4d396001bc6eb949088916 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

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

#include "chrome/browser/chromeos/extensions/media_player_api.h"

#include "chrome/browser/chromeos/extensions/media_player_event_router.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/login/screen_locker.h"

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

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

@@ -42,6 +41,7 @@

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

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

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

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

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