Chromium Code Reviews| 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 98b5799d9dbd1beb3c5f2cc4376e577b091a9547..9421610918d9194c7854ee1ef52177b8c068ac5c 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -61,6 +61,7 @@ |
| #include "chrome/browser/chromeos/login/wizard_controller.h" |
| #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" |
| #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" |
| +#include "chrome/browser/chromeos/net/network_pref_state_observer.h" |
| #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" |
| #include "chrome/browser/chromeos/options/cert_library.h" |
| #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" |
| @@ -652,6 +653,9 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| network_portal_detector::GetInstance()->Enable(true); |
| } |
| + // Initialize a observer to update NetworkHandler's pref based services. |
|
emaxx
2016/11/02 18:18:04
nit: s/a observer/an observer/
stevenjb
2016/11/02 19:47:33
Done.
|
| + network_pref_state_observer_ = base::MakeUnique<NetworkPrefStateObserver>(); |
| + |
| // Initialize input methods. |
| input_method::InputMethodManager* manager = |
| input_method::InputMethodManager::Get(); |
| @@ -795,6 +799,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| // We should remove observers attached to D-Bus clients before |
| // DBusThreadManager is shut down. |
| + network_pref_state_observer_.reset(); |
| extension_volume_observer_.reset(); |
| peripheral_battery_observer_.reset(); |
| power_prefs_.reset(); |