| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_frame/policy_settings.h" | 5 #include "chrome_frame/policy_settings.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "base/win/registry.h" | 12 #include "base/win/registry.h" |
| 13 #include "chrome/common/policy_constants.h" | |
| 14 #include "chrome_frame/utils.h" | 13 #include "chrome_frame/utils.h" |
| 14 #include "policy/policy_constants.h" |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // This array specifies the order in which registry keys are tested. Do not | 18 // This array specifies the order in which registry keys are tested. Do not |
| 19 // change this unless the decision is made product-wide (i.e., in Chrome's | 19 // change this unless the decision is made product-wide (i.e., in Chrome's |
| 20 // configuration policy provider). | 20 // configuration policy provider). |
| 21 const HKEY kRootKeys[] = { | 21 const HKEY kRootKeys[] = { |
| 22 HKEY_LOCAL_MACHINE, | 22 HKEY_LOCAL_MACHINE, |
| 23 HKEY_CURRENT_USER | 23 HKEY_CURRENT_USER |
| 24 }; | 24 }; |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 swap(default_renderer_, default_renderer); | 153 swap(default_renderer_, default_renderer); |
| 154 swap(renderer_exclusion_list_, renderer_exclusion_list); | 154 swap(renderer_exclusion_list_, renderer_exclusion_list); |
| 155 swap(content_type_list_, content_type_list); | 155 swap(content_type_list_, content_type_list); |
| 156 swap(application_locale_, application_locale); | 156 swap(application_locale_, application_locale); |
| 157 } | 157 } |
| 158 | 158 |
| 159 // static | 159 // static |
| 160 PolicySettings* PolicySettings::GetInstance() { | 160 PolicySettings* PolicySettings::GetInstance() { |
| 161 return Singleton<PolicySettings>::get(); | 161 return Singleton<PolicySettings>::get(); |
| 162 } | 162 } |
| OLD | NEW |