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

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

Issue 6480033: Implement experimental.contentSettings.misc.blockThirdPartyCookies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 9 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extension_prefs.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_util.h" 7 #include "base/string_util.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_pref_store.h" 10 #include "chrome/browser/extensions/extension_pref_store.h"
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 } 1270 }
1271 1271
1272 extension_pref_value_map_->NotifyInitializationCompleted(); 1272 extension_pref_value_map_->NotifyInitializationCompleted();
1273 } 1273 }
1274 1274
1275 1275
1276 void ExtensionPrefs::SetExtensionControlledPref(const std::string& extension_id, 1276 void ExtensionPrefs::SetExtensionControlledPref(const std::string& extension_id,
1277 const std::string& pref_key, 1277 const std::string& pref_key,
1278 bool incognito, 1278 bool incognito,
1279 Value* value) { 1279 Value* value) {
1280 DCHECK(pref_service()->FindPreference(pref_key.c_str())) 1280 #ifndef NDEBUG
1281 << "Extension controlled preference key " << pref_key 1281 const PrefService::Preference* pref =
1282 << " not registered."; 1282 pref_service()->FindPreference(pref_key.c_str());
1283 DCHECK(pref) << "Extension controlled preference key " << pref_key
1284 << " not registered.";
1285 DCHECK_EQ(pref->GetType(), value->GetType())
1286 << "Extension controlled preference " << pref_key << " has wrong type.";
1287 #endif
1283 1288
1284 if (!incognito) { 1289 if (!incognito) {
1285 // Also store in persisted Preferences file to recover after a 1290 // Also store in persisted Preferences file to recover after a
1286 // browser restart. 1291 // browser restart.
1287 DictionaryValue* dict = GetExtensionControlledPrefs(extension_id); 1292 DictionaryValue* dict = GetExtensionControlledPrefs(extension_id);
1288 dict->SetWithoutPathExpansion(pref_key, value->DeepCopy()); 1293 dict->SetWithoutPathExpansion(pref_key, value->DeepCopy());
1289 pref_service()->ScheduleSavePersistentPrefs(); 1294 pref_service()->ScheduleSavePersistentPrefs();
1290 } 1295 }
1291 1296
1292 extension_pref_value_map_->SetExtensionPref( 1297 extension_pref_value_map_->SetExtensionPref(
(...skipping 24 matching lines...) Expand all
1317 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) { 1322 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
1318 prefs->RegisterDictionaryPref(kExtensionsPref); 1323 prefs->RegisterDictionaryPref(kExtensionsPref);
1319 prefs->RegisterListPref(kExtensionToolbar); 1324 prefs->RegisterListPref(kExtensionToolbar);
1320 prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1); 1325 prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
1321 prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate); 1326 prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
1322 prefs->RegisterListPref(prefs::kExtensionInstallAllowList); 1327 prefs->RegisterListPref(prefs::kExtensionInstallAllowList);
1323 prefs->RegisterListPref(prefs::kExtensionInstallDenyList); 1328 prefs->RegisterListPref(prefs::kExtensionInstallDenyList);
1324 prefs->RegisterListPref(prefs::kExtensionInstallForceList); 1329 prefs->RegisterListPref(prefs::kExtensionInstallForceList);
1325 prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */); 1330 prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */);
1326 } 1331 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698