| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h" | 5 #include "ios/chrome/browser/prefs/ios_chrome_pref_service_factory.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| 11 #include "base/prefs/json_pref_store.h" | 11 #include "components/prefs/json_pref_store.h" |
| 12 #include "base/prefs/persistent_pref_store.h" | 12 #include "components/prefs/persistent_pref_store.h" |
| 13 #include "base/prefs/pref_filter.h" | 13 #include "components/prefs/pref_filter.h" |
| 14 #include "base/prefs/pref_service.h" | 14 #include "components/prefs/pref_service.h" |
| 15 #include "components/proxy_config/proxy_config_pref_names.h" | 15 #include "components/proxy_config/proxy_config_pref_names.h" |
| 16 #include "components/search_engines/default_search_pref_migration.h" | 16 #include "components/search_engines/default_search_pref_migration.h" |
| 17 #include "components/syncable_prefs/pref_service_syncable.h" | 17 #include "components/syncable_prefs/pref_service_syncable.h" |
| 18 #include "components/syncable_prefs/pref_service_syncable_factory.h" | 18 #include "components/syncable_prefs/pref_service_syncable_factory.h" |
| 19 #include "ios/chrome/browser/application_context.h" | 19 #include "ios/chrome/browser/application_context.h" |
| 20 #include "ios/chrome/browser/prefs/ios_chrome_pref_model_associator_client.h" | 20 #include "ios/chrome/browser/prefs/ios_chrome_pref_model_associator_client.h" |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 const char kPreferencesFilename[] = "Preferences"; | 24 const char kPreferencesFilename[] = "Preferences"; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 syncable_prefs::PrefServiceSyncable* pref_service) { | 76 syncable_prefs::PrefServiceSyncable* pref_service) { |
| 77 // List of keys that cannot be changed in the user prefs file by the incognito | 77 // List of keys that cannot be changed in the user prefs file by the incognito |
| 78 // browser state. All preferences that store information about the browsing | 78 // browser state. All preferences that store information about the browsing |
| 79 // history or behaviour of the user should have this property. | 79 // history or behaviour of the user should have this property. |
| 80 std::vector<const char*> overlay_pref_names; | 80 std::vector<const char*> overlay_pref_names; |
| 81 overlay_pref_names.push_back(proxy_config::prefs::kProxy); | 81 overlay_pref_names.push_back(proxy_config::prefs::kProxy); |
| 82 return make_scoped_ptr(pref_service->CreateIncognitoPrefService( | 82 return make_scoped_ptr(pref_service->CreateIncognitoPrefService( |
| 83 nullptr, // incognito_extension_pref_store | 83 nullptr, // incognito_extension_pref_store |
| 84 overlay_pref_names)); | 84 overlay_pref_names)); |
| 85 } | 85 } |
| OLD | NEW |