ui/base/ime/input_method_chromeos.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: ui/base/ime/input_method_chromeos.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: ui/base/ime/input_method_chromeos.cc

diff --git a/ui/base/ime/input_method_chromeos.cc b/ui/base/ime/input_method_chromeos.cc

index 1a4b7e60a66d8d7e79fe9a776f7d8ab392d23772..e6491e3cc139f869a1944cdafca60ed6ac415d3b 100644

--- a/ui/base/ime/input_method_chromeos.cc

+++ b/ui/base/ime/input_method_chromeos.cc

@@ -17,7 +17,7 @@

#include "base/strings/utf_string_conversions.h"

#include "base/sys_info.h"

#include "base/third_party/icu/icu_utf.h"

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

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

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

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

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