Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 12319145: Using the new Network*Handlers in networkingPrivate Extension API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Initial patch. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c768ca57be3b83b79ee3ed09b1bdf10c5bb2157e..28c610b60b50115afca6fcaf1e691febf865be59 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -262,11 +262,8 @@ class DBusServices {
chromeos::GeolocationHandler::Initialize();
chromeos::NetworkStateHandler::Initialize();
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableNewNetworkConfigurationHandlers)) {
- 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
@@ -304,11 +301,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();

Powered by Google App Engine
This is Rietveld 408576698