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

Unified Diff: chrome/browser/appcache/chrome_appcache_service.cc

Issue 2878075: Introduce a resource identifier for content settings. (Closed)
Patch Set: updates Created 10 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/automation/automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/appcache/chrome_appcache_service.cc
diff --git a/chrome/browser/appcache/chrome_appcache_service.cc b/chrome/browser/appcache/chrome_appcache_service.cc
index c2e41a0c88e039b9da5364299dc840e5c6e16a67..5f58b297c67d8666f0033cd32a329fca9e5b0318 100644
--- a/chrome/browser/appcache/chrome_appcache_service.cc
+++ b/chrome/browser/appcache/chrome_appcache_service.cc
@@ -80,7 +80,7 @@ void ChromeAppCacheService::ClearLocalState(const FilePath& profile_path) {
bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url) {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
ContentSetting setting = host_contents_settings_map_->GetContentSetting(
- manifest_url, CONTENT_SETTINGS_TYPE_COOKIES);
+ manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
DCHECK(setting != CONTENT_SETTING_DEFAULT);
// We don't prompt for read access.
return setting != CONTENT_SETTING_BLOCK;
@@ -90,7 +90,7 @@ int ChromeAppCacheService::CanCreateAppCache(
const GURL& manifest_url, net::CompletionCallback* callback) {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
ContentSetting setting = host_contents_settings_map_->GetContentSetting(
- manifest_url, CONTENT_SETTINGS_TYPE_COOKIES);
+ manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
DCHECK(setting != CONTENT_SETTING_DEFAULT);
if (setting == CONTENT_SETTING_ASK) {
ChromeThread::PostTask(
@@ -109,7 +109,7 @@ void ChromeAppCacheService::DoPrompt(
// The setting may have changed (due to the "remember" option)
ContentSetting setting = host_contents_settings_map_->GetContentSetting(
- manifest_url, CONTENT_SETTINGS_TYPE_COOKIES);
+ manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
if (setting != CONTENT_SETTING_ASK) {
int rv = (setting != CONTENT_SETTING_BLOCK) ? net::OK :
net::ERR_ACCESS_DENIED;
« no previous file with comments | « no previous file | chrome/browser/automation/automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698