chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.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/chromeos/keyboard_overlay_ui.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/views/omnibox/omnibox_view_views.h ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

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

index 60b3aa0427def04d08fddfe34acb7beec8bf6bc0..d868c5c9443f7ac75e9d3779c0ef74da8f045ef4 100644

--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

@@ -19,6 +19,8 @@

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

#include "chromeos/chromeos_switches.h"

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

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

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

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

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

@@ -26,8 +28,6 @@

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

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

#include "grit/browser_resources.h"

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

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

using chromeos::input_method::ModifierKey;

using content::WebUIMessageHandler;