chrome/browser/ui/webui/options/chromeos/cros_language_options_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/options/chromeos/cros_language_options_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/options/chromeos/cros_language_options_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/keyboard_handler.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 d53f9bbe6fe0e7c3dda7331e6741f5ec2faa5e43..f9ae003aac3de5f4f2f9ac3ed72e0ff82106ce33 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

@@ -22,6 +22,9 @@

#include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

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

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

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

#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

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

@@ -30,9 +33,6 @@

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

#include "extensions/common/manifest_url_handlers.h"

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

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

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

#include "ui/base/l10n/l10n_util.h"

using base::UserMetricsAction;