Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROMEOS_IME_COMPOSITION_TEXT_H_ | 5 #ifndef CHROMEOS_IME_COMPOSITION_TEXT_H_ |
| 6 #define CHROMEOS_IME_COMPOSITION_TEXT_H_ | 6 #define CHROMEOS_IME_COMPOSITION_TEXT_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
| 13 #include "chromeos/chromeos_export.h" | 13 #include "chromeos/chromeos_export.h" |
| 14 | 14 |
| 15 namespace chromeos { | 15 namespace chromeos { |
| 16 | 16 |
| 17 class CHROMEOS_EXPORT CompositionText { | 17 class CHROMEOS_EXPORT CompositionText { |
| 18 public: | 18 public: |
| 19 enum UnderlineType { | 19 enum UnderlineType { |
| 20 COMPOSITION_TEXT_UNDERLINE_SINGLE = 1, | 20 COMPOSITION_TEXT_UNDERLINE_SINGLE = 1, |
| 21 COMPOSITION_TEXT_UNDERLINE_DOUBLE = 2, | 21 COMPOSITION_TEXT_UNDERLINE_DOUBLE = 2, |
| 22 COMPOSITION_TEXT_UNDERLINE_ERROR = 4, | 22 COMPOSITION_TEXT_UNDERLINE_NONE = 4, |
|
Seigo Nonaka
2014/10/13 06:23:10
nit: this value is no longer being unique bit valu
| |
| 23 COMPOSITION_TEXT_UNDERLINE_ERROR = 8, | |
| 23 }; | 24 }; |
| 24 | 25 |
| 25 struct UnderlineAttribute { | 26 struct UnderlineAttribute { |
| 26 UnderlineType type; | 27 UnderlineType type; |
| 27 uint32 start_index; // The inclusive start index. | 28 uint32 start_index; // The inclusive start index. |
| 28 uint32 end_index; // The exclusive end index. | 29 uint32 end_index; // The exclusive end index. |
| 29 }; | 30 }; |
| 30 | 31 |
| 31 CompositionText(); | 32 CompositionText(); |
| 32 virtual ~CompositionText(); | 33 virtual ~CompositionText(); |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 60 std::vector<UnderlineAttribute> underline_attributes_; | 61 std::vector<UnderlineAttribute> underline_attributes_; |
| 61 uint32 selection_start_; | 62 uint32 selection_start_; |
| 62 uint32 selection_end_; | 63 uint32 selection_end_; |
| 63 | 64 |
| 64 DISALLOW_COPY_AND_ASSIGN(CompositionText); | 65 DISALLOW_COPY_AND_ASSIGN(CompositionText); |
| 65 }; | 66 }; |
| 66 | 67 |
| 67 } // namespace chromeos | 68 } // namespace chromeos |
| 68 | 69 |
| 69 #endif // CHROMEOS_IME_COMPOSITION_TEXT_H_ | 70 #endif // CHROMEOS_IME_COMPOSITION_TEXT_H_ |
| OLD | NEW |