summaryrefslogtreecommitdiffstats
path: root/webkit/storage
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 22:02:38 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 22:02:38 +0000
commit08b1f75f74bdf7769e3a8ac2d587c9729353c1d8 (patch)
tree7c05052cb83a88ad8c4a35c3ccf94d6dcf5e2b96 /webkit/storage
parent910b52bcf700ef412da46a15e85ea9a80b2b3f75 (diff)
downloadchromium_src-08b1f75f74bdf7769e3a8ac2d587c9729353c1d8.zip
chromium_src-08b1f75f74bdf7769e3a8ac2d587c9729353c1d8.tar.gz
chromium_src-08b1f75f74bdf7769e3a8ac2d587c9729353c1d8.tar.bz2
Move webkit/database to webkit/browser and webkit/common. Also move content::WebDatabaseObserverImpl to the new common_child library.
- just moving the files in the source repository - and fixing up complilation guards - and fixing up include paths throughout - and fixing up DEPs files as needed Note: Everything in /webkit is still being built into the same old webkit_storage target for now, new actual build target(s) will come later. BUG=239109 R=jamesr@chromium.org, kinuko@chromium.org, piman@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/15367010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/storage')
-rw-r--r--webkit/storage/webkit_storage.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index bcc6b97..fa5bfd5 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -6,7 +6,6 @@
'includes': [
'../appcache/webkit_appcache.gypi',
'../blob/webkit_blob.gypi',
- '../database/webkit_database.gypi',
'../dom_storage/webkit_dom_storage.gypi',
'../fileapi/webkit_fileapi.gypi',
'../quota/webkit_quota.gypi',
@@ -14,6 +13,7 @@
# TODO(kinuko): Deprecate this when we have a new target for
# webkit_browser. crbug.com/239710
'../browser/webkit_browser.gypi',
+ '../common/webkit_common.gypi',
],
'targets': [
{
@@ -37,13 +37,13 @@
'../storage/webkit_storage_export.h',
'<@(webkit_appcache_sources)',
'<@(webkit_blob_sources)',
- '<@(webkit_database_sources)',
'<@(webkit_dom_storage_sources)',
'<@(webkit_fileapi_sources)',
'<@(webkit_quota_sources)',
# TODO(kinuko): Deprecate this when we have a new target for
# webkit_browser. crbug.com/239710
'<@(webkit_browser_storage_sources)',
+ '<@(webkit_common_storage_sources)',
],
'conditions': [
['chromeos==1', {