chrome/browser/chromeos/preferences.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/preferences.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/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index 2e1b505716ef452d39ce026482a1bc9c5d58775c..fdf1d2028b4919f71bd961bb92131bb2d244953b 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

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

#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

#include "chrome/browser/chromeos/drive/drive_file_system_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/input_method_util.h"

#include "chrome/browser/chromeos/input_method/xkeyboard.h"

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

@@ -34,6 +33,7 @@

#include "chrome/common/pref_names.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_policy_controller.h"

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

#include "components/user_prefs/pref_registry_syncable.h"

#include "googleurl/src/gurl.h"

#include "third_party/icu/public/i18n/unicode/timezone.h"