| 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" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // Nofail swap in the new values. (Note: this is all that need be protected | 146 // Nofail swap in the new values. (Note: this is all that need be protected |
| 147 // under a mutex if/when this becomes thread safe.) | 147 // under a mutex if/when this becomes thread safe.) |
| 148 using std::swap; | 148 using std::swap; |
| 149 | 149 |
| 150 swap(default_renderer_, default_renderer); | 150 swap(default_renderer_, default_renderer); |
| 151 swap(renderer_exclusion_list_, renderer_exclusion_list); | 151 swap(renderer_exclusion_list_, renderer_exclusion_list); |
| 152 swap(content_type_list_, content_type_list); | 152 swap(content_type_list_, content_type_list); |
| 153 swap(application_locale_, application_locale); | 153 swap(application_locale_, application_locale); |
| 154 } | 154 } |
| 155 | 155 |
| 156 // static |
| 157 PolicySettings* PolicySettings::GetInstance() { |
| 158 return Singleton<PolicySettings>::get(); |
| 159 } |
| OLD | NEW |