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

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

Issue 11362111: Fix: infolist requries description title. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reupload 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
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 #include "chromeos/dbus/ibus/ibus_text.h" 5 #include "chromeos/dbus/ibus/ibus_text.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chromeos/dbus/ibus/ibus_object.h" 8 #include "chromeos/dbus/ibus/ibus_object.h"
9 #include "dbus/message.h" 9 #include "dbus/message.h"
10 10
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 << "The 2nd variant entry should contain variant."; 136 << "The 2nd variant entry should contain variant.";
137 return false; 137 return false;
138 } 138 }
139 139
140 std::string value; 140 std::string value;
141 if (!sub_variant_reader.PopString(&value)) 141 if (!sub_variant_reader.PopString(&value))
142 continue; // Ignore other attachment values. 142 continue; // Ignore other attachment values.
143 143
144 if (key == "annotation") 144 if (key == "annotation")
145 ibus_text->set_annotation(value); 145 ibus_text->set_annotation(value);
146 else if (key == "description") 146 else if (key == "description_title")
147 ibus_text->set_description(value); 147 ibus_text->set_description_title(value);
148 else if (key == "description_body")
149 ibus_text->set_description_body(value);
148 else 150 else
149 continue; // Ignore other fields. 151 continue; // Ignore other fields.
150 } 152 }
151 153
152 std::string text; 154 std::string text;
153 if (!ibus_text_reader.PopString(&text)) { 155 if (!ibus_text_reader.PopString(&text)) {
154 LOG(ERROR) << "Invalid variant structure[IBusText]: " 156 LOG(ERROR) << "Invalid variant structure[IBusText]: "
155 << "1st argument should be string."; 157 << "1st argument should be string.";
156 return false; 158 return false;
157 } 159 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // IBusText 219 // IBusText
218 IBusText::IBusText() 220 IBusText::IBusText()
219 : text_("") { 221 : text_("") {
220 } 222 }
221 223
222 IBusText::~IBusText() { 224 IBusText::~IBusText() {
223 } 225 }
224 226
225 } // namespace ibus 227 } // namespace ibus
226 } // namespace chromeos 228 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698