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

Side by Side Diff: chromeos/dbus/ibus/ibus_text.h

Issue 11362111: Fix: infolist requries description title. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments on 11361210 Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/ibus/ibus_lookup_table.cc ('k') | chromeos/dbus/ibus/ibus_text.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_DBUS_IBUS_IBUS_TEXT_H_ 5 #ifndef CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
6 #define CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_ 6 #define CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 virtual ~IBusText(); 142 virtual ~IBusText();
143 143
144 const std::string& text() const { return text_; } 144 const std::string& text() const { return text_; }
145 void set_text(const std::string& text) { text_ = text; } 145 void set_text(const std::string& text) { text_ = text; }
146 146
147 const std::string& annotation() const { return annotation_; } 147 const std::string& annotation() const { return annotation_; }
148 void set_annotation(const std::string& annotation) { 148 void set_annotation(const std::string& annotation) {
149 annotation_ = annotation; 149 annotation_ = annotation;
150 } 150 }
151 151
152 const std::string& description() const { return description_; } 152 const std::string& description_title() const { return description_title_; }
153 void set_description(const std::string& description) { 153 void set_description_title(const std::string& title) {
154 description_ = description; 154 description_title_ = title;
155 }
156
157 const std::string& description_body() const { return description_body_; }
158 void set_description_body(const std::string& body) {
159 description_body_ = body;
155 } 160 }
156 161
157 const std::vector<UnderlineAttribute>& underline_attributes() const { 162 const std::vector<UnderlineAttribute>& underline_attributes() const {
158 return underline_attributes_; 163 return underline_attributes_;
159 } 164 }
160 165
161 std::vector<UnderlineAttribute>* mutable_underline_attributes() { 166 std::vector<UnderlineAttribute>* mutable_underline_attributes() {
162 return &underline_attributes_; 167 return &underline_attributes_;
163 } 168 }
164 169
165 const std::vector<SelectionAttribute>& selection_attributes() const { 170 const std::vector<SelectionAttribute>& selection_attributes() const {
166 return selection_attributes_; 171 return selection_attributes_;
167 } 172 }
168 std::vector<SelectionAttribute>* mutable_selection_attributes() { 173 std::vector<SelectionAttribute>* mutable_selection_attributes() {
169 return &selection_attributes_; 174 return &selection_attributes_;
170 } 175 }
171 176
172 private: 177 private:
173 std::string text_; 178 std::string text_;
174 std::string annotation_; 179 std::string annotation_;
175 std::string description_; 180 std::string description_title_;
181 std::string description_body_;
176 std::vector<UnderlineAttribute> underline_attributes_; 182 std::vector<UnderlineAttribute> underline_attributes_;
177 std::vector<SelectionAttribute> selection_attributes_; 183 std::vector<SelectionAttribute> selection_attributes_;
178 184
179 DISALLOW_COPY_AND_ASSIGN(IBusText); 185 DISALLOW_COPY_AND_ASSIGN(IBusText);
180 }; 186 };
181 187
182 } // namespace ibus 188 } // namespace ibus
183 } // namespace chromeos 189 } // namespace chromeos
184 190
185 #endif // CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_ 191 #endif // CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/ibus/ibus_lookup_table.cc ('k') | chromeos/dbus/ibus/ibus_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698