| 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
|
|
|