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 50ee3ed42fff935bcc827188e8d532176170ef76..97069b42685cd2ba6fd1981847481818ba57d49f 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -283,11 +283,8 @@ class DBusServices { |
| chromeos::GeolocationHandler::Initialize(); |
| chromeos::NetworkStateHandler::Initialize(); |
| - if (CommandLine::ForCurrentProcess()->HasSwitch( |
| - chromeos::switches::kEnableNewNetworkConfigurationHandlers)) { |
|
stevenjb
2013/03/04 18:57:58
If we're changing the meaning of this, we should c
pneubeck (no reviews)
2013/03/05 13:11:55
Done.
|
| - chromeos::NetworkConfigurationHandler::Initialize(); |
| - chromeos::ManagedNetworkConfigurationHandler::Initialize(); |
| - } |
| + chromeos::NetworkConfigurationHandler::Initialize(); |
| + chromeos::ManagedNetworkConfigurationHandler::Initialize(); |
| // Initialize the network change notifier for Chrome OS. The network |
| // change notifier starts to monitor changes from the power manager and |
| @@ -325,11 +322,8 @@ class DBusServices { |
| if (cros_initialized_ && CrosLibrary::Get()) |
| CrosLibrary::Shutdown(); |
| - if (CommandLine::ForCurrentProcess()->HasSwitch( |
| - chromeos::switches::kEnableNewNetworkConfigurationHandlers)) { |
| - chromeos::ManagedNetworkConfigurationHandler::Shutdown(); |
| - chromeos::NetworkConfigurationHandler::Shutdown(); |
| - } |
| + chromeos::ManagedNetworkConfigurationHandler::Shutdown(); |
| + chromeos::NetworkConfigurationHandler::Shutdown(); |
| chromeos::ConnectivityStateHelper::Shutdown(); |
| chromeos::NetworkStateHandler::Shutdown(); |