Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2236)

Unified Diff: ui/base/ime/chromeos/composition_text.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/BUILD.gn ('k') | ui/base/ime/chromeos/composition_text.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/composition_text.h
diff --git a/ui/base/ime/chromeos/composition_text.h b/ui/base/ime/chromeos/composition_text.h
deleted file mode 100644
index 90b8a8c9a1faab5338cdce65524ed8632f5f05d8..0000000000000000000000000000000000000000
--- a/ui/base/ime/chromeos/composition_text.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// 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_
-
-#include <string>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/strings/string16.h"
-#include "ui/base/ime/ui_base_ime_export.h"
-
-namespace chromeos {
-
-class UI_BASE_IME_EXPORT CompositionText {
- public:
- enum UnderlineType {
- COMPOSITION_TEXT_UNDERLINE_SINGLE = 1,
- COMPOSITION_TEXT_UNDERLINE_DOUBLE = 2,
- COMPOSITION_TEXT_UNDERLINE_NONE = 4,
- COMPOSITION_TEXT_UNDERLINE_ERROR = 8,
- };
-
- struct UnderlineAttribute {
- UnderlineType type;
- uint32 start_index; // The inclusive start index.
- uint32 end_index; // The exclusive end index.
- };
-
- CompositionText();
- virtual ~CompositionText();
-
- // Accessors
- const base::string16& text() const { return text_; }
- void set_text(const base::string16& text) { text_ = text; }
-
- const std::vector<UnderlineAttribute>& underline_attributes() const {
- return underline_attributes_;
- }
-
- std::vector<UnderlineAttribute>* mutable_underline_attributes() {
- return &underline_attributes_;
- }
-
- uint32 selection_start() const { return selection_start_; }
- void set_selection_start(uint32 selection_start) {
- selection_start_ = selection_start;
- }
-
- uint32 selection_end() const { return selection_end_; }
- void set_selection_end(uint32 selection_end) {
- selection_end_ = selection_end;
- }
-
- void CopyFrom(const CompositionText& obj);
-
- private:
- base::string16 text_;
- std::vector<UnderlineAttribute> underline_attributes_;
- uint32 selection_start_;
- uint32 selection_end_;
-
- DISALLOW_COPY_AND_ASSIGN(CompositionText);
-};
-
-} // namespace chromeos
-
-#endif // UI_BASE_IME_CHROMEOS_COMPOSITION_TEXT_H_
« no previous file with comments | « ui/base/ime/BUILD.gn ('k') | ui/base/ime/chromeos/composition_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698