ui/base/ime/chromeos/composition_text_chromeos.h - 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/chromeos/composition_text_chromeos.h

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/chromeos/composition_text_chromeos.h

diff --git a/ui/base/ime/chromeos/composition_text.h b/ui/base/ime/chromeos/composition_text_chromeos.h

similarity index 90%

rename from ui/base/ime/chromeos/composition_text.h

rename to ui/base/ime/chromeos/composition_text_chromeos.h

index 90b8a8c9a1faab5338cdce65524ed8632f5f05d8..3350b0e09871f7749785ad65c43d3b5e6a066386 100644

--- a/ui/base/ime/chromeos/composition_text.h

+++ b/ui/base/ime/chromeos/composition_text_chromeos.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_

-#define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_

+#ifndef UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_

+#define UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_

#include <string>

#include <vector>

@@ -67,4 +67,4 @@ class UI_BASE_IME_EXPORT CompositionText {

} // namespace chromeos

-#endif // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_

+#endif // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_CHROMEOS_H_