chrome/browser/content_settings/tab_specific_content_settings.cc - Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings.cc

Issue 442383002: Move storage-related files from webkit/ to new top-level directory storage/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 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 | « chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc ('k') | chrome/browser/devtools/devtools_file_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/tab_specific_content_settings.cc

diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc

index 735366456ba994d594c1ae5830315377c62cac6a..9eec9556340ed51e1c695838df870f127c567305 100644

--- a/chrome/browser/content_settings/tab_specific_content_settings.cc

+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc

@@ -34,7 +34,7 @@

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_delegate.h"

#include "net/cookies/canonical_cookie.h"

-#include "webkit/common/fileapi/file_system_types.h"

+#include "storage/common/fileapi/file_system_types.h"

using content::BrowserThread;

using content::NavigationController;

@@ -442,12 +442,12 @@ void TabSpecificContentSettings::OnFileSystemAccessed(

const GURL& url,

bool blocked_by_policy) {

if (blocked_by_policy) {

- blocked_local_shared_objects_.file_systems()->AddFileSystem(url,

- fileapi::kFileSystemTypeTemporary, 0);

+ blocked_local_shared_objects_.file_systems()->AddFileSystem(

+ url, storage::kFileSystemTypeTemporary, 0);

OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES);

} else {

- allowed_local_shared_objects_.file_systems()->AddFileSystem(url,

- fileapi::kFileSystemTypeTemporary, 0);

+ allowed_local_shared_objects_.file_systems()->AddFileSystem(

+ url, storage::kFileSystemTypeTemporary, 0);

OnContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES);

}