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

Unified Diff: dbus/exported_object.cc

Issue 9363045: Revert 121920 - dbus: add ObjectPath type (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 | « dbus/exported_object.h ('k') | dbus/message.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/exported_object.cc
===================================================================
--- dbus/exported_object.cc (revision 121922)
+++ dbus/exported_object.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,7 +13,6 @@
#include "base/time.h"
#include "dbus/bus.h"
#include "dbus/message.h"
-#include "dbus/object_path.h"
#include "dbus/scoped_dbus_error.h"
namespace dbus {
@@ -36,7 +35,7 @@
ExportedObject::ExportedObject(Bus* bus,
const std::string& service_name,
- const ObjectPath& object_path)
+ const std::string& object_path)
: bus_(bus),
service_name_(service_name),
object_path_(object_path),
@@ -176,8 +175,8 @@
this,
error.get());
if (!success) {
- LOG(ERROR) << "Failed to register the object: " << object_path_.value()
- << ": " << (error.is_set() ? error.message() : "");
+ LOG(ERROR) << "Failed to register the object: " << object_path_ << ": "
+ << (error.is_set() ? error.message() : "");
return false;
}
« no previous file with comments | « dbus/exported_object.h ('k') | dbus/message.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698