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

Unified Diff: chromeos/dbus/ibus/ibus_lookup_table.cc

Issue 11358033: Clean Up: Remove mozc.candidate attachment field handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/ibus/ibus_lookup_table.h ('k') | chromeos/dbus/ibus/ibus_lookup_table_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_lookup_table.cc
diff --git a/chromeos/dbus/ibus/ibus_lookup_table.cc b/chromeos/dbus/ibus/ibus_lookup_table.cc
index 0c732451d920d39cb818e77b8ed6cd1b9b3e90cc..21b894a4bcdf9b3b78a3b669a9ea3a4ce56b4618 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table.cc
@@ -78,7 +78,7 @@ bool PopIBusLookupTable(dbus::MessageReader* reader, IBusLookupTable* table) {
<< "The 1st dictionary entry should be string.";
return false;
}
- if (key != "mozc.candidates")
+ if (key != "show_window_at_composition")
continue;
dbus::MessageReader variant_reader(NULL);
@@ -95,16 +95,11 @@ bool PopIBusLookupTable(dbus::MessageReader* reader, IBusLookupTable* table) {
return false;
}
- uint8* bytes = NULL;
- size_t length = 0;
- if (!sub_variant_reader.PopArrayOfBytes(&bytes, &length)) {
- LOG(ERROR) << "Invalid mozc.candidates structure: "
- << "The mozc.candidates contains array of bytes.";
- return false;
- }
+ bool show_window_at_composition = false;
+ if (!sub_variant_reader.PopBool(&show_window_at_composition))
+ continue; // Ignores other field.
- table->set_serialized_mozc_candidates_data(
- std::string(reinterpret_cast<char*>(bytes), length));
+ table->set_show_window_at_composition(show_window_at_composition);
}
uint32 page_size = 0;
« no previous file with comments | « chromeos/dbus/ibus/ibus_lookup_table.h ('k') | chromeos/dbus/ibus/ibus_lookup_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698