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..19ac6175d0a601504911776ed3e5e069dd21e969 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" |
| @@ -690,6 +691,9 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| if (!user_manager::UserManager::Get()->IsLoggedInAsGuest()) |
| low_disk_notification_ = base::MakeUnique<LowDiskNotification>(); |
| + // Initialize a observer to update NetworkHandler's pref based services. |
| + network_pref_state_observer_.reset(new NetworkPrefStateObserver); |
|
James Cook
2016/11/01 23:02:03
nit: Does this have to be here, or can it live up
stevenjb
2016/11/01 23:55:11
Moved near portal detection which should be fine.
|
| + |
| ChromeBrowserMainPartsLinux::PostProfileInit(); |
| } |
| @@ -799,6 +803,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| peripheral_battery_observer_.reset(); |
| power_prefs_.reset(); |
| renderer_freezer_.reset(); |
| + network_pref_state_observer_.reset(); |
|
James Cook
2016/11/01 23:02:03
Could this be reset a few lines earlier, like abov
stevenjb
2016/11/01 23:55:11
Moved.
|
| wake_on_wifi_manager_.reset(); |
| ScreenLocker::ShutDownClass(); |
| keyboard_event_rewriters_.reset(); |