| 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 e585ff7e185cbe5fa8889284b65d2db6dfa9a243..7a49c594ae6e7f3ecb95d2365b0963e82cff5973 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/image_burner_client.h"
|
| #include "chrome/browser/chromeos/dbus/introspectable_client.h"
|
| #include "chrome/browser/chromeos/dbus/power_manager_client.h"
|
| @@ -62,6 +63,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 image burner client.
|
| image_burner_client_.reset(ImageBurnerClient::Create(system_bus_.get()));
|
| // Create the introspectable object client.
|
| @@ -135,6 +139,11 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| }
|
|
|
| // DBusThreadManager override.
|
| + virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() OVERRIDE {
|
| + return flimflam_ipconfig_client_.get();
|
| + }
|
| +
|
| + // DBusThreadManager override.
|
| virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE {
|
| return image_burner_client_.get();
|
| }
|
| @@ -174,6 +183,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<ImageBurnerClient> image_burner_client_;
|
| scoped_ptr<IntrospectableClient> introspectable_client_;
|
| scoped_ptr<PowerManagerClient> power_manager_client_;
|
|
|