diff options
| author | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 01:14:49 +0000 |
|---|---|---|
| committer | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 01:14:49 +0000 |
| commit | 418ed5ab9cd81a2106893fce7aa121f693c6a98f (patch) | |
| tree | e91f4b793e1c1b73775c0507993c16ad6fabffce /webkit/appcache | |
| parent | 730aef2589a2e544797931eab99ea3d770040d99 (diff) | |
| download | chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.zip chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.tar.gz chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.tar.bz2 | |
Upstreaming WebKit.gyp
This mega patch contains a few simple but tightly dependent changes:
1. Deletion of webkit/api/WebKit.gyp. The file now lives in webkit.org.
2. Rename of webkit/webkit.gyp to webkit/webkit_glue.gyp. Having two webkit.gyp was a source of developer confusion.
3. Gyp dependencies are updated across chromium to point at the upstream WebKit.gyp and the renamed webkit_glue.gyp.
4. Some 200+ files include paths fixed to point to third_party/WebKit/WebKit/chromium instead of webkit/api. The later will be deleted in a subsequent patch.
Review URL: http://codereview.chromium.org/387020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
| -rw-r--r-- | webkit/appcache/appcache_interfaces.cc | 2 | ||||
| -rw-r--r-- | webkit/appcache/web_application_cache_host_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/appcache/web_application_cache_host_impl.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/webkit/appcache/appcache_interfaces.cc b/webkit/appcache/appcache_interfaces.cc index 5b24597..d48f342 100644 --- a/webkit/appcache/appcache_interfaces.cc +++ b/webkit/appcache/appcache_interfaces.cc @@ -6,7 +6,7 @@ #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" -#include "webkit/api/public/WebApplicationCacheHost.h" +#include "third_party/WebKit/WebKit/chromium/public/WebApplicationCacheHost.h" using WebKit::WebApplicationCacheHost; diff --git a/webkit/appcache/web_application_cache_host_impl.cc b/webkit/appcache/web_application_cache_host_impl.cc index 2ec081f..ed0257f 100644 --- a/webkit/appcache/web_application_cache_host_impl.cc +++ b/webkit/appcache/web_application_cache_host_impl.cc @@ -7,9 +7,9 @@ #include "base/compiler_specific.h" #include "base/id_map.h" #include "base/string_util.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" using WebKit::WebApplicationCacheHost; using WebKit::WebApplicationCacheHostClient; diff --git a/webkit/appcache/web_application_cache_host_impl.h b/webkit/appcache/web_application_cache_host_impl.h index c530eba..e5e529e 100644 --- a/webkit/appcache/web_application_cache_host_impl.h +++ b/webkit/appcache/web_application_cache_host_impl.h @@ -6,8 +6,8 @@ #define WEBKIT_APPCACHE_WEB_APPLICATION_CACHE_HOST_IMPL_H_ #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebApplicationCacheHostClient.h" -#include "webkit/api/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebApplicationCacheHostClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" #include "webkit/appcache/appcache_interfaces.h" namespace appcache { |