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

Unified Diff: chromeos/dbus/ibus/ibus_property.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_property.h ('k') | chromeos/dbus/ibus/ibus_property_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_property.cc
diff --git a/chromeos/dbus/ibus/ibus_property.cc b/chromeos/dbus/ibus/ibus_property.cc
index 5bbde666cdd38c364c3763eee70b9ae2f9c4e56f..56c0d7662b42d1089892c74a342ef768ace5bdcd 100644
--- a/chromeos/dbus/ibus/ibus_property.cc
+++ b/chromeos/dbus/ibus/ibus_property.cc
@@ -12,8 +12,6 @@
#include "dbus/message.h"
namespace chromeos {
-// TODO(nona): remove ibus namespace after complete libibus removal.
-namespace ibus {
bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader,
IBusProperty* property) {
@@ -94,10 +92,10 @@ bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader,
}
DCHECK_LE(state, 3UL);
- if (state == IBUS_PROPERTY_STATE_INCONSISTENT) {
+ if (state == ibus::IBUS_PROPERTY_STATE_INCONSISTENT) {
LOG(ERROR) << "PROP_STATE_INCONSISTENT is not supported in Chrome OS.";
} else {
- property->set_checked(state == IBUS_PROPERTY_STATE_CHECKED);
+ property->set_checked(state == ibus::IBUS_PROPERTY_STATE_CHECKED);
}
if (!ibus_property_reader.PopIBusPropertyList(
@@ -180,5 +178,4 @@ IBusProperty::IBusProperty()
IBusProperty::~IBusProperty() {
}
-} // namespace ibus
} // namespace chromeos
« no previous file with comments | « chromeos/dbus/ibus/ibus_property.h ('k') | chromeos/dbus/ibus/ibus_property_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698