Supporting callback for Disconnected signal.

dbus/bus.h

 // Copyright (c) 2012 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.
 
 #ifndef DBUS_BUS_H_
 #define DBUS_BUS_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 183 matching lines @@
 
   // Creates a Bus object. The actual connection will be established when
   // Connect() is called.
   explicit Bus(const Options& options);
 
   // Called when an ownership request is complete.
   // Parameters:
   // - the requested service name.
   // - whether ownership has been obtained or not.
   typedef base::Callback<void (const std::string&, bool)> OnOwnershipCallback;
+
+  // Called when the connection with dbus-daemon is closed. This function is
+  // also called when the connection is closed by ShutdownAndBlock. |callback|
+  // can be null callback.
+  typedef base::Callback<void ()> OnDisconnectedCallback;

[satorux1, 2013/02/13 08:06:53]

I think you can just use base::Closure because this callback does not take
anything

[Seigo Nonaka, 2013/02/13 09:45:29]

Done.

+  void SetDisconnectedCallback(const OnDisconnectedCallback& callback);
+
   // TODO(satorux): Remove the service name parameter as the caller of
   // RequestOwnership() knows the service name.
 
   // Gets the object proxy for the given service name and the object path.
   // The caller must not delete the returned object.
   //
   // Returns an existing object proxy if the bus object already owns the
   // object proxy for the given service name and the object path.
   // Never returns NULL.
   //
@@ skipping 270 matching lines @@
 
   // Returns true if the bus is connected to D-Bus.
   bool is_connected() { return connection_ != NULL; }
 
  protected:
   // This is protected, so we can define sub classes.
   virtual ~Bus();
 
  private:
   friend class base::RefCountedThreadSafe<Bus>;
+  friend class DisconnectableBusForTesting;

[satorux1, 2013/02/13 08:06:53]

This worries me because

1) 'friend' should be avoided in general
2) inheritance should also be avoided in general.

Seems to me that  DisconnectableBusForTesting just adds CloseConnection()
function.

I think it'd be simpler to add CloseConnection() to the Bus class.

[Seigo Nonaka, 2013/02/13 09:45:29]

Sure, adding CloseConnection.
Thanks.

 
   // Helper function used for RemoveObjectProxy().
   void RemoveObjectProxyInternal(scoped_refptr<dbus::ObjectProxy> object_proxy,
                                  const base::Closure& callback);
 
   // Helper function used for UnregisterExportedObject().
   void UnregisterExportedObjectInternal(
       scoped_refptr<dbus::ExportedObject> exported_object);
 
   // Helper function used for ShutdownOnDBusThreadAndBlock().
@@ skipping 90 matching lines @@
 
   bool async_operations_set_up_;
   bool shutdown_completed_;
 
   // Counters to make sure that OnAddWatch()/OnRemoveWatch() and
   // OnAddTimeout()/OnRemoveTimeou() are balanced.
   int num_pending_watches_;
   int num_pending_timeouts_;
 
   std::string address_;
+  OnDisconnectedCallback on_disconnected_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Bus);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_BUS_H_