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

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 73ebc916cd087a4cbbce919b1df542b7aef93924..66a0fd499f8def3d63dfad405b4ada7c4b111cbc 100644

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

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

@@ -32,10 +32,10 @@

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

#include "chrome/grit/generated_resources.h"

#include "chromeos/chromeos_switches.h"

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

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

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

#include "ui/aura/window.h"

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

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

#if !defined(USE_ATHENA)

« no previous file with comments | « chrome/browser/extensions/api/input_ime/input_ime_api.cc ('k') | chrome/browser/ui/ash/ime_controller_chromeos.cc » ('j') | no next file with comments »