| OLD | NEW |
| 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/prefs/chrome_pref_service_factory.h" | 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/ui/profile_error_dialog.h" | 23 #include "chrome/browser/ui/profile_error_dialog.h" |
| 24 #include "components/user_prefs/pref_registry_syncable.h" | 24 #include "components/user_prefs/pref_registry_syncable.h" |
| 25 #include "content/public/browser/browser_context.h" | 25 #include "content/public/browser/browser_context.h" |
| 26 #include "content/public/browser/browser_thread.h" | 26 #include "content/public/browser/browser_thread.h" |
| 27 #include "grit/chromium_strings.h" | 27 #include "grit/chromium_strings.h" |
| 28 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
| 29 | 29 |
| 30 #if defined(ENABLE_CONFIGURATION_POLICY) | 30 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 31 #include "chrome/browser/policy/browser_policy_connector.h" | 31 #include "chrome/browser/policy/browser_policy_connector.h" |
| 32 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 32 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
| 33 #include "chrome/browser/policy/policy_types.h" | 33 #include "components/policy/core/common/policy_types.h" |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 #if defined(ENABLE_MANAGED_USERS) | 36 #if defined(ENABLE_MANAGED_USERS) |
| 37 #include "chrome/browser/managed_mode/supervised_user_pref_store.h" | 37 #include "chrome/browser/managed_mode/supervised_user_pref_store.h" |
| 38 #endif | 38 #endif |
| 39 | 39 |
| 40 using content::BrowserContext; | 40 using content::BrowserContext; |
| 41 using content::BrowserThread; | 41 using content::BrowserThread; |
| 42 | 42 |
| 43 namespace { | 43 namespace { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 pref_filename, | 159 pref_filename, |
| 160 pref_io_task_runner, | 160 pref_io_task_runner, |
| 161 policy_service, | 161 policy_service, |
| 162 managed_user_settings, | 162 managed_user_settings, |
| 163 extension_prefs, | 163 extension_prefs, |
| 164 async); | 164 async); |
| 165 return factory.CreateSyncable(pref_registry.get()); | 165 return factory.CreateSyncable(pref_registry.get()); |
| 166 } | 166 } |
| 167 | 167 |
| 168 } // namespace chrome_prefs | 168 } // namespace chrome_prefs |
| OLD | NEW |