| 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/extensions/api/preference/preference_api.h" | 5 #include "chrome/browser/extensions/api/preference/preference_api.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 void PreferenceAPI::InitExtensionControlledPrefs( | 446 void PreferenceAPI::InitExtensionControlledPrefs( |
| 447 ExtensionPrefs* prefs, | 447 ExtensionPrefs* prefs, |
| 448 ExtensionPrefValueMap* value_map) { | 448 ExtensionPrefValueMap* value_map) { |
| 449 ExtensionIdList extension_ids; | 449 ExtensionIdList extension_ids; |
| 450 prefs->GetExtensions(&extension_ids); | 450 prefs->GetExtensions(&extension_ids); |
| 451 | 451 |
| 452 for (ExtensionIdList::iterator extension_id = extension_ids.begin(); | 452 for (ExtensionIdList::iterator extension_id = extension_ids.begin(); |
| 453 extension_id != extension_ids.end(); ++extension_id) { | 453 extension_id != extension_ids.end(); ++extension_id) { |
| 454 base::Time install_time = prefs->GetInstallTime(*extension_id); | 454 base::Time install_time = prefs->GetInstallTime(*extension_id); |
| 455 bool is_enabled = !prefs->IsExtensionDisabled(*extension_id); | 455 bool is_enabled = !prefs->IsExtensionDisabled(*extension_id); |
| 456 value_map->RegisterExtension(*extension_id, install_time, is_enabled); | 456 bool is_incognito_enabled = prefs->IsIncognitoEnabled(*extension_id); |
| 457 value_map->RegisterExtension( |
| 458 *extension_id, install_time, is_enabled, is_incognito_enabled); |
| 457 prefs->content_settings_store()->RegisterExtension( | 459 prefs->content_settings_store()->RegisterExtension( |
| 458 *extension_id, install_time, is_enabled); | 460 *extension_id, install_time, is_enabled); |
| 459 | 461 |
| 460 // Set regular extension controlled prefs. | 462 // Set regular extension controlled prefs. |
| 461 LoadExtensionControlledPrefs(prefs, | 463 LoadExtensionControlledPrefs(prefs, |
| 462 value_map, | 464 value_map, |
| 463 *extension_id, | 465 *extension_id, |
| 464 kExtensionPrefsScopeRegular); | 466 kExtensionPrefsScopeRegular); |
| 465 // Set incognito extension controlled prefs. | 467 // Set incognito extension controlled prefs. |
| 466 LoadExtensionControlledPrefs(prefs, | 468 LoadExtensionControlledPrefs(prefs, |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 std::string browser_pref; | 735 std::string browser_pref; |
| 734 if (!ValidateBrowserPref(pref_key, &browser_pref)) | 736 if (!ValidateBrowserPref(pref_key, &browser_pref)) |
| 735 return false; | 737 return false; |
| 736 | 738 |
| 737 PreferenceAPI::Get(GetProfile()) | 739 PreferenceAPI::Get(GetProfile()) |
| 738 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); | 740 ->RemoveExtensionControlledPref(extension_id(), browser_pref, scope); |
| 739 return true; | 741 return true; |
| 740 } | 742 } |
| 741 | 743 |
| 742 } // namespace extensions | 744 } // namespace extensions |
| OLD | NEW |