chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.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/webui/options/chromeos/cros_language_options_handler.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:

View side-by-side diff with in-line comments

Download patch

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

Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

index 690358873cca3a40e9e99acf7ca9da6991d1d61e..a7a194a2bda3067957f49acd0c982a4b074b6f01 100644

--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

@@ -17,12 +17,12 @@

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/browser_process.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/lifetime/application_lifetime.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_finder.h"

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

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

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

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