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

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

Issue 13957012: Adding a NetworkProfileHandler used by ManagedNetworkConfigurationHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed one comment. Created 7 years, 8 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 1ead091f1bea88bb3fe085bf316656d87ff0d900..61ca7315fdcf9ef9e5324d9b0188fbfbe1fd2755 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -109,6 +109,7 @@
#include "chromeos/network/network_change_notifier_factory_chromeos.h"
#include "chromeos/network/network_configuration_handler.h"
#include "chromeos/network/network_event_log.h"
+#include "chromeos/network/network_profile_handler.h"
#include "chromeos/network/network_state_handler.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
@@ -315,8 +316,11 @@ class DBusServices {
chromeos::GeolocationHandler::Initialize();
chromeos::NetworkStateHandler::Initialize();
+ chromeos::NetworkProfileHandler* profile_handler =
+ chromeos::NetworkProfileHandler::Initialize();
chromeos::NetworkConfigurationHandler::Initialize();
- chromeos::ManagedNetworkConfigurationHandler::Initialize();
+ chromeos::ManagedNetworkConfigurationHandler::Initialize(
+ profile_handler);
// Initialize the network change notifier for Chrome OS. The network
// change notifier starts to monitor changes from the power manager and
@@ -360,6 +364,7 @@ class DBusServices {
chromeos::ManagedNetworkConfigurationHandler::Shutdown();
chromeos::NetworkConfigurationHandler::Shutdown();
+ chromeos::NetworkProfileHandler::Shutdown();
chromeos::NetworkStateHandler::Shutdown();
chromeos::GeolocationHandler::Shutdown();
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/networking_private_api.cc » ('j') | chromeos/dbus/shill_profile_client_stub.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698