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

Unified Diff: dbus/exported_object.h

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/end_to_end_sync_unittest.cc ('k') | dbus/exported_object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/exported_object.h
===================================================================
--- dbus/exported_object.h (revision 121922)
+++ dbus/exported_object.h (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.
@@ -17,7 +17,6 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
#include "base/time.h"
-#include "dbus/object_path.h"
namespace dbus {
@@ -37,7 +36,7 @@
// constructor.
ExportedObject(Bus* bus,
const std::string& service_name,
- const ObjectPath& object_path);
+ const std::string& object_path);
// Called to send a response from an exported method. Response* is the
// response message. Callers should pass a NULL Response* in the event
@@ -158,7 +157,7 @@
scoped_refptr<Bus> bus_;
std::string service_name_;
- ObjectPath object_path_;
+ std::string object_path_;
bool object_is_registered_;
// The method table where keys are absolute method names (i.e. interface
« no previous file with comments | « dbus/end_to_end_sync_unittest.cc ('k') | dbus/exported_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698