Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: chrome/browser/extensions/extension_prefs.cc

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/extension_prefs.h" 5 #include "chrome/browser/extensions/extension_prefs.h"
6 6
7 #include "base/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/api/alarms/alarm_manager.h" 10 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 ExtensionPrefs::ExtensionPrefs( 244 ExtensionPrefs::ExtensionPrefs(
245 PrefService* prefs, 245 PrefService* prefs,
246 const FilePath& root_dir, 246 const FilePath& root_dir,
247 ExtensionPrefValueMap* extension_pref_value_map) 247 ExtensionPrefValueMap* extension_pref_value_map)
248 : prefs_(prefs), 248 : prefs_(prefs),
249 install_directory_(root_dir), 249 install_directory_(root_dir),
250 extension_pref_value_map_(extension_pref_value_map), 250 extension_pref_value_map_(extension_pref_value_map),
251 ALLOW_THIS_IN_INITIALIZER_LIST(extension_sorting_( 251 ALLOW_THIS_IN_INITIALIZER_LIST(extension_sorting_(
252 new ExtensionSorting(this, prefs))), 252 new ExtensionSorting(this, prefs))),
253 content_settings_store_(new ExtensionContentSettingsStore()) { 253 content_settings_store_(new extensions::ContentSettingsStore()) {
254 } 254 }
255 255
256 ExtensionPrefs::~ExtensionPrefs() { 256 ExtensionPrefs::~ExtensionPrefs() {
257 } 257 }
258 258
259 void ExtensionPrefs::Init(bool extensions_disabled) { 259 void ExtensionPrefs::Init(bool extensions_disabled) {
260 MakePathsRelative(); 260 MakePathsRelative();
261 261
262 InitPrefStore(extensions_disabled); 262 InitPrefStore(extensions_disabled);
263 263
(...skipping 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1769 *ext_id, i.key(), kExtensionPrefsScopeIncognitoPersistent, 1769 *ext_id, i.key(), kExtensionPrefsScopeIncognitoPersistent,
1770 i.value().DeepCopy()); 1770 i.value().DeepCopy());
1771 } 1771 }
1772 1772
1773 // Set content settings. 1773 // Set content settings.
1774 const DictionaryValue* extension_prefs = GetExtensionPref(*ext_id); 1774 const DictionaryValue* extension_prefs = GetExtensionPref(*ext_id);
1775 DCHECK(extension_prefs); 1775 DCHECK(extension_prefs);
1776 ListValue* content_settings = NULL; 1776 ListValue* content_settings = NULL;
1777 if (extension_prefs->GetList(kPrefContentSettings, 1777 if (extension_prefs->GetList(kPrefContentSettings,
1778 &content_settings)) { 1778 &content_settings)) {
1779 content_settings_store_->SetExtensionContentSettingsFromList( 1779 content_settings_store_->SetExtensionContentSettingFromList(
1780 *ext_id, content_settings, 1780 *ext_id, content_settings,
1781 kExtensionPrefsScopeRegular); 1781 kExtensionPrefsScopeRegular);
1782 } 1782 }
1783 if (extension_prefs->GetList(kPrefIncognitoContentSettings, 1783 if (extension_prefs->GetList(kPrefIncognitoContentSettings,
1784 &content_settings)) { 1784 &content_settings)) {
1785 content_settings_store_->SetExtensionContentSettingsFromList( 1785 content_settings_store_->SetExtensionContentSettingFromList(
1786 *ext_id, content_settings, 1786 *ext_id, content_settings,
1787 kExtensionPrefsScopeIncognitoPersistent); 1787 kExtensionPrefsScopeIncognitoPersistent);
1788 } 1788 }
1789 } 1789 }
1790 1790
1791 extension_pref_value_map_->NotifyInitializationCompleted(); 1791 extension_pref_value_map_->NotifyInitializationCompleted();
1792 } 1792 }
1793 1793
1794 void ExtensionPrefs::SetExtensionControlledPref( 1794 void ExtensionPrefs::SetExtensionControlledPref(
1795 const std::string& extension_id, 1795 const std::string& extension_id,
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1909 prefs->RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion, 1909 prefs->RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion,
1910 "0", // default value 1910 "0", // default value
1911 PrefService::UNSYNCABLE_PREF); 1911 PrefService::UNSYNCABLE_PREF);
1912 prefs->RegisterInt64Pref(prefs::kLastExtensionsUpdateCheck, 1912 prefs->RegisterInt64Pref(prefs::kLastExtensionsUpdateCheck,
1913 0, // default value 1913 0, // default value
1914 PrefService::UNSYNCABLE_PREF); 1914 PrefService::UNSYNCABLE_PREF);
1915 prefs->RegisterInt64Pref(prefs::kNextExtensionsUpdateCheck, 1915 prefs->RegisterInt64Pref(prefs::kNextExtensionsUpdateCheck,
1916 0, // default value 1916 0, // default value
1917 PrefService::UNSYNCABLE_PREF); 1917 PrefService::UNSYNCABLE_PREF);
1918 } 1918 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.h ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698