| 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 adf3739298038f267d447494a72a011875deaea8..6c6b74184f671a027eafea80707f78c1999677ff 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -49,6 +49,7 @@
|
| #include "chrome/browser/chromeos/login/wallpaper_manager.h"
|
| #include "chrome/browser/chromeos/login/wizard_controller.h"
|
| #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
|
| +#include "chrome/browser/chromeos/net/chrome_network_watcher.h"
|
| #include "chrome/browser/chromeos/net/network_portal_detector.h"
|
| #include "chrome/browser/chromeos/options/cert_library.h"
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| @@ -478,6 +479,8 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
|
| if (parsed_command_line().HasSwitch(::switches::kAllowFileAccess))
|
| ChromeNetworkDelegate::AllowAccessToAllFiles();
|
|
|
| + chrome_network_watcher_.reset(new ChromeNetworkWatcher);
|
| +
|
| // There are two use cases for kLoginUser:
|
| // 1) if passed in tandem with kLoginPassword, to drive a "StubLogin"
|
| // 2) if passed alone, to signal that the indicated user has already
|
| @@ -765,6 +768,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
|
|
| // We should remove observers attached to D-Bus clients before
|
| // DBusThreadManager is shut down.
|
| + chrome_network_watcher_.reset();
|
| extension_system_event_observer_.reset();
|
| retail_mode_power_save_blocker_.reset();
|
| peripheral_battery_observer_.reset();
|
|
|