ash/system/chromeos/tray_caps_lock.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: ash/system/chromeos/tray_caps_lock.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: ash/system/chromeos/tray_caps_lock.cc

diff --git a/ash/system/chromeos/tray_caps_lock.cc b/ash/system/chromeos/tray_caps_lock.cc

index 5dacde2df2d04ec3dfddfb060a998f0d566e860c..0a29fcd5b89264438d2603ef2072c3c1ea39ec0b 100644

--- a/ash/system/chromeos/tray_caps_lock.cc

+++ b/ash/system/chromeos/tray_caps_lock.cc

@@ -12,11 +12,11 @@

#include "ash/system/tray/system_tray_notifier.h"

#include "ash/system/tray/tray_constants.h"

#include "base/sys_info.h"

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

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

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

#include "ui/accessibility/ax_view_state.h"

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

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image.h"

#include "ui/views/controls/image_view.h"

« no previous file with comments | « ash/system/chromeos/tray_caps_lock.h ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.h » ('j') | no next file with comments »