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

Unified Diff: chrome/browser/policy/configuration_policy_handler_list.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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/policy/configuration_policy_handler_list.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
index 46160f46531efb45a814c16ae17f1392590a6e14..57c7128b6a6f85dab67ac6d5b97faac428a16197 100644
--- a/chrome/browser/policy/configuration_policy_handler_list.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/policy/policy_error_map.h"
#include "chrome/browser/policy/policy_map.h"
#include "chrome/common/pref_names.h"
+#include "chromeos/network/onc/onc_constants.h"
#include "grit/generated_resources.h"
#include "policy/policy_constants.h"
@@ -392,11 +393,11 @@ ConfigurationPolicyHandlerList::ConfigurationPolicyHandlerList() {
handlers_.push_back(
new NetworkConfigurationPolicyHandler(
key::kDeviceOpenNetworkConfiguration,
- chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY));
+ chromeos::onc::ONC_SOURCE_DEVICE_POLICY));
handlers_.push_back(
new NetworkConfigurationPolicyHandler(
key::kOpenNetworkConfiguration,
- chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY));
+ chromeos::onc::ONC_SOURCE_USER_POLICY));
handlers_.push_back(new PinnedLauncherAppsPolicyHandler());
#endif // defined(OS_CHROMEOS)
}

Powered by Google App Engine
This is Rietveld 408576698