| Index: chrome/browser/chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chrome/browser/chromeos/dbus/dbus_thread_manager.cc b/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
|
| index 4f4ea5355b744a766afd7e4b2bde063b2dfcdc48..57aefd991c570cfb438f73f2bf18d87a56133bb0 100644
|
| --- a/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/chromeos/dbus/cashew_client.h"
|
| #include "chrome/browser/chromeos/dbus/cros_disks_client.h"
|
| #include "chrome/browser/chromeos/dbus/cryptohome_client.h"
|
| +#include "chrome/browser/chromeos/dbus/flimflam_ipconfig_client.h"
|
| #include "chrome/browser/chromeos/dbus/flimflam_network_client.h"
|
| #include "chrome/browser/chromeos/dbus/image_burner_client.h"
|
| #include "chrome/browser/chromeos/dbus/introspectable_client.h"
|
| @@ -63,6 +64,9 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| // Create the Cryptohome client.
|
| cryptohome_client_.reset(
|
| CryptohomeClient::Create(system_bus_.get()));
|
| + // Create the Flimflam IPConfig client.
|
| + flimflam_ipconfig_client_.reset(
|
| + FlimflamIPConfigClient::Create(system_bus_.get()));
|
| // Create the Flimflam Network client.
|
| flimflam_network_client_.reset(
|
| FlimflamNetworkClient::Create(system_bus_.get()));
|
| @@ -139,6 +143,10 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| }
|
|
|
| // DBusThreadManager override.
|
| + virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() OVERRIDE {
|
| + return flimflam_ipconfig_client_.get();
|
| + }
|
| +
|
| virtual FlimflamNetworkClient* GetFlimflamNetworkClient() OVERRIDE {
|
| return flimflam_network_client_.get();
|
| }
|
| @@ -183,6 +191,7 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| scoped_ptr<CashewClient> cashew_client_;
|
| scoped_ptr<CrosDisksClient> cros_disks_client_;
|
| scoped_ptr<CryptohomeClient> cryptohome_client_;
|
| + scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_;
|
| scoped_ptr<FlimflamNetworkClient> flimflam_network_client_;
|
| scoped_ptr<ImageBurnerClient> image_burner_client_;
|
| scoped_ptr<IntrospectableClient> introspectable_client_;
|
|
|