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 /chrome/renderer/extensions | |
| 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 'chrome/renderer/extensions')
| -rw-r--r-- | chrome/renderer/extensions/bindings_utils.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/event_bindings.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 6c35b25..988068e 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index e23c060..ba7e898 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,9 +14,9 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "grit/renderer_resources.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" using bindings_utils::CallFunctionInContext; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index fee736a..ce5295a 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -25,10 +25,10 @@ #include "grit/renderer_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" using bindings_utils::GetStringResource; using bindings_utils::ContextInfo; |