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

Side by Side Diff: chrome/browser/policy/configuration_policy_handler_list.cc

Issue 8804020: Set onc_source UI data parameter when importing ONC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, remove ONC data from ui data. Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/configuration_policy_handler_list.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/policy/configuration_policy_handler.h" 9 #include "chrome/browser/policy/configuration_policy_handler.h"
10 #include "chrome/browser/policy/policy_error_map.h" 10 #include "chrome/browser/policy/policy_error_map.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 handlers_.push_back(new ProxyPolicyHandler()); 222 handlers_.push_back(new ProxyPolicyHandler());
223 handlers_.push_back(new SyncPolicyHandler()); 223 handlers_.push_back(new SyncPolicyHandler());
224 224
225 #if !defined(OS_CHROMEOS) 225 #if !defined(OS_CHROMEOS)
226 handlers_.push_back(new DownloadDirPolicyHandler()); 226 handlers_.push_back(new DownloadDirPolicyHandler());
227 #endif // !defined(OS_CHROMEOS) 227 #endif // !defined(OS_CHROMEOS)
228 228
229 #if defined(OS_CHROMEOS) 229 #if defined(OS_CHROMEOS)
230 handlers_.push_back( 230 handlers_.push_back(
231 new NetworkConfigurationPolicyHandler( 231 new NetworkConfigurationPolicyHandler(
232 kPolicyDeviceOpenNetworkConfiguration)); 232 kPolicyDeviceOpenNetworkConfiguration,
233 chromeos::NetworkUIData::ONC_SOURCE_DEVICE_POLICY));
233 handlers_.push_back( 234 handlers_.push_back(
234 new NetworkConfigurationPolicyHandler( 235 new NetworkConfigurationPolicyHandler(
235 kPolicyOpenNetworkConfiguration)); 236 kPolicyOpenNetworkConfiguration,
237 chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY));
236 #endif // defined(OS_CHROMEOS) 238 #endif // defined(OS_CHROMEOS)
237 } 239 }
238 240
239 ConfigurationPolicyHandlerList::~ConfigurationPolicyHandlerList() { 241 ConfigurationPolicyHandlerList::~ConfigurationPolicyHandlerList() {
240 STLDeleteElements(&handlers_); 242 STLDeleteElements(&handlers_);
241 } 243 }
242 244
243 void ConfigurationPolicyHandlerList::ApplyPolicySettings( 245 void ConfigurationPolicyHandlerList::ApplyPolicySettings(
244 const PolicyMap& policies, 246 const PolicyMap& policies,
245 PrefValueMap* prefs, 247 PrefValueMap* prefs,
(...skipping 17 matching lines...) Expand all
263 } 265 }
264 266
265 void ConfigurationPolicyHandlerList::PrepareForDisplaying( 267 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
266 PolicyMap* policies) const { 268 PolicyMap* policies) const {
267 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; 269 std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
268 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) 270 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
269 (*handler)->PrepareForDisplaying(policies); 271 (*handler)->PrepareForDisplaying(policies);
270 } 272 }
271 273
272 } // namespace policy 274 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698