chrome/browser/chromeos/input_method/input_method_engine.cc - Issue 1149223004: Avoid basename conflict in text_composition

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/chromeos/input_method/input_method_engine.cc

Issue 1149223004: Avoid basename conflict in text_composition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 7 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:

Index: chrome/browser/chromeos/input_method/input_method_engine.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc

index e5475ca5d5c513939de8d3a939a25b335218177c..0c53579b2eda32b74ce0f83c9dce0101e010ed4a 100644

--- a/chrome/browser/chromeos/input_method/input_method_engine.cc

+++ b/chrome/browser/chromeos/input_method/input_method_engine.cc

@@ -22,7 +22,7 @@

#include "ui/aura/window_tree_host.h"

#include "ui/base/ime/candidate_window.h"

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

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

+#include "ui/base/ime/chromeos/composition_text_chromeos.h"

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

#include "ui/base/ime/chromeos/ime_keymap.h"

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

« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc » ('j') | no next file with comments »