| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef DBUS_OBJECT_PROXY_H_ | 5 #ifndef DBUS_OBJECT_PROXY_H_ | 
| 6 #define DBUS_OBJECT_PROXY_H_ | 6 #define DBUS_OBJECT_PROXY_H_ | 
| 7 | 7 | 
| 8 #include <dbus/dbus.h> | 8 #include <dbus/dbus.h> | 
| 9 | 9 | 
| 10 #include <map> | 10 #include <map> | 
| 11 #include <set> | 11 #include <set> | 
| 12 #include <string> | 12 #include <string> | 
| 13 #include <vector> | 13 #include <vector> | 
| 14 | 14 | 
| 15 #include "base/callback.h" | 15 #include "base/callback.h" | 
| 16 #include "base/macros.h" | 16 #include "base/macros.h" | 
| 17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" | 
|  | 18 #include "base/memory/scoped_ptr.h" | 
| 18 #include "base/strings/string_piece.h" | 19 #include "base/strings/string_piece.h" | 
| 19 #include "base/time/time.h" | 20 #include "base/time/time.h" | 
| 20 #include "dbus/dbus_export.h" | 21 #include "dbus/dbus_export.h" | 
| 21 #include "dbus/object_path.h" | 22 #include "dbus/object_path.h" | 
| 22 | 23 | 
| 23 namespace dbus { | 24 namespace dbus { | 
| 24 | 25 | 
| 25 class Bus; | 26 class Bus; | 
| 26 class ErrorResponse; | 27 class ErrorResponse; | 
| 27 class MethodCall; | 28 class MethodCall; | 
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 322   std::string service_name_owner_; | 323   std::string service_name_owner_; | 
| 323 | 324 | 
| 324   std::set<DBusPendingCall*> pending_calls_; | 325   std::set<DBusPendingCall*> pending_calls_; | 
| 325 | 326 | 
| 326   DISALLOW_COPY_AND_ASSIGN(ObjectProxy); | 327   DISALLOW_COPY_AND_ASSIGN(ObjectProxy); | 
| 327 }; | 328 }; | 
| 328 | 329 | 
| 329 }  // namespace dbus | 330 }  // namespace dbus | 
| 330 | 331 | 
| 331 #endif  // DBUS_OBJECT_PROXY_H_ | 332 #endif  // DBUS_OBJECT_PROXY_H_ | 
| OLD | NEW | 
|---|