| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index a54caaeb4662b2ae03b6a420f6c861e52ec3651a..d117e5ef949989dce53785d324d6b149c5ab87ea 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -111,6 +111,7 @@
|
| #include "chromeos/network/network_change_notifier_factory_chromeos.h"
|
| #include "chromeos/network/network_configuration_handler.h"
|
| #include "chromeos/network/network_event_log.h"
|
| +#include "chromeos/network/network_profile_handler.h"
|
| #include "chromeos/network/network_state_handler.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -322,8 +323,11 @@ class DBusServices {
|
| chromeos::GeolocationHandler::Initialize();
|
| chromeos::NetworkStateHandler::Initialize();
|
|
|
| + chromeos::NetworkProfileHandler* profile_handler =
|
| + chromeos::NetworkProfileHandler::Initialize();
|
| chromeos::NetworkConfigurationHandler::Initialize();
|
| - chromeos::ManagedNetworkConfigurationHandler::Initialize();
|
| + chromeos::ManagedNetworkConfigurationHandler::Initialize(
|
| + profile_handler);
|
|
|
| // Initialize the network change notifier for Chrome OS. The network
|
| // change notifier starts to monitor changes from the power manager and
|
| @@ -367,6 +371,7 @@ class DBusServices {
|
|
|
| chromeos::ManagedNetworkConfigurationHandler::Shutdown();
|
| chromeos::NetworkConfigurationHandler::Shutdown();
|
| + chromeos::NetworkProfileHandler::Shutdown();
|
|
|
| chromeos::NetworkStateHandler::Shutdown();
|
| chromeos::GeolocationHandler::Shutdown();
|
|
|