chrome/browser/chromeos/input_method/input_method_engine_browsertests.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_browsertests.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:

View side-by-side diff with in-line comments

Download patch

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

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

index e63a742538648284748efefae6c7ea56eb590107..b21d737fc692b1ce6b05af01ebbb9ff72d7381bb 100644

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

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

@@ -12,7 +12,7 @@

#include "extensions/common/manifest_handlers/background_info.h"

#include "extensions/test/extension_test_message_listener.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/ime_bridge.h"

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

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

« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine.cc ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »