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

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

Issue 27536003: Moved prefs::kUserPolicyRefreshRate to component/policy/policy_pref_names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <limits> 7 #include <limits>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/prefs/pref_value_map.h" 10 #include "base/prefs/pref_value_map.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/net/proxy_policy_handler.h" 13 #include "chrome/browser/net/proxy_policy_handler.h"
14 #include "chrome/browser/policy/configuration_policy_handler.h" 14 #include "chrome/browser/policy/configuration_policy_handler.h"
15 #include "chrome/browser/policy/policy_error_map.h" 15 #include "chrome/browser/policy/policy_error_map.h"
16 #include "chrome/browser/policy/policy_map.h" 16 #include "chrome/browser/policy/policy_map.h"
17 #include "chrome/browser/search_engines/default_search_policy_handler.h" 17 #include "chrome/browser/search_engines/default_search_policy_handler.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "components/policy/core/common/policy_pref_names.h"
19 #include "extensions/common/manifest.h" 20 #include "extensions/common/manifest.h"
20 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
21 #include "policy/policy_constants.h" 22 #include "policy/policy_constants.h"
22 23
23 #if defined(OS_CHROMEOS) 24 #if defined(OS_CHROMEOS)
24 #include "ash/magnifier/magnifier_constants.h" 25 #include "ash/magnifier/magnifier_constants.h"
25 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 26 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
26 #include "chromeos/dbus/power_policy_controller.h" 27 #include "chromeos/dbus/power_policy_controller.h"
27 #endif // defined(OS_CHROMEOS) 28 #endif // defined(OS_CHROMEOS)
28 29
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 { key::kDisablePluginFinder, 219 { key::kDisablePluginFinder,
219 prefs::kDisablePluginFinder, 220 prefs::kDisablePluginFinder,
220 Value::TYPE_BOOLEAN }, 221 Value::TYPE_BOOLEAN },
221 { key::kDiskCacheSize, 222 { key::kDiskCacheSize,
222 prefs::kDiskCacheSize, 223 prefs::kDiskCacheSize,
223 Value::TYPE_INTEGER }, 224 Value::TYPE_INTEGER },
224 { key::kMediaCacheSize, 225 { key::kMediaCacheSize,
225 prefs::kMediaCacheSize, 226 prefs::kMediaCacheSize,
226 Value::TYPE_INTEGER }, 227 Value::TYPE_INTEGER },
227 { key::kPolicyRefreshRate, 228 { key::kPolicyRefreshRate,
228 prefs::kUserPolicyRefreshRate, 229 policy_prefs::kUserPolicyRefreshRate,
229 Value::TYPE_INTEGER }, 230 Value::TYPE_INTEGER },
230 { key::kDevicePolicyRefreshRate, 231 { key::kDevicePolicyRefreshRate,
231 prefs::kDevicePolicyRefreshRate, 232 prefs::kDevicePolicyRefreshRate,
232 Value::TYPE_INTEGER }, 233 Value::TYPE_INTEGER },
233 { key::kDefaultBrowserSettingEnabled, 234 { key::kDefaultBrowserSettingEnabled,
234 prefs::kDefaultBrowserSettingEnabled, 235 prefs::kDefaultBrowserSettingEnabled,
235 Value::TYPE_BOOLEAN }, 236 Value::TYPE_BOOLEAN },
236 { key::kRemoteAccessHostFirewallTraversal, 237 { key::kRemoteAccessHostFirewallTraversal,
237 prefs::kRemoteAccessHostFirewallTraversal, 238 prefs::kRemoteAccessHostFirewallTraversal,
238 Value::TYPE_BOOLEAN }, 239 Value::TYPE_BOOLEAN },
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 } 630 }
630 631
631 void ConfigurationPolicyHandlerList::PrepareForDisplaying( 632 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
632 PolicyMap* policies) const { 633 PolicyMap* policies) const {
633 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; 634 std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
634 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) 635 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
635 (*handler)->PrepareForDisplaying(policies); 636 (*handler)->PrepareForDisplaying(policies);
636 } 637 }
637 638
638 } // namespace policy 639 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698