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

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

Issue 11783053: Clean Up: Remove ibus namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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 | « 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 e44d046611b2d16dade9a8352624f1cbd99f712c..77aa07c8aea3ed8b6be48b5d62f6a9d3a5fea18b 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table.cc
@@ -12,8 +12,6 @@
#include "dbus/message.h"
namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
namespace {
// The default entry number of a page in IBusLookupTable.
@@ -43,7 +41,7 @@ void AppendIBusLookupTable(const IBusLookupTable& table,
bool have_labels = false;
for (size_t i = 0; i < candidates.size(); ++i) {
// Write candidate string as IBusText.
- ibus::IBusText text;
+ IBusText text;
text.set_text(candidates[i].value);
text.set_annotation(candidates[i].annotation);
text.set_description_title(candidates[i].description_title);
@@ -132,7 +130,7 @@ bool PopIBusLookupTable(dbus::MessageReader* reader, IBusLookupTable* table) {
std::vector<IBusLookupTable::Entry>* candidates = table->mutable_candidates();
while (text_array_reader.HasMoreData()) {
- ibus::IBusText candidate_text;
+ IBusText candidate_text;
// The attributes in IBusText are not used in Chrome.
if (!PopIBusText(&text_array_reader, &candidate_text)) {
LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: "
@@ -229,5 +227,4 @@ IBusLookupTable::Entry::Entry() {
IBusLookupTable::Entry::~Entry() {
}
-} // namespace ibus
} // namespace chromeos
« 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