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/browser/tab_contents | |
| 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/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/web_drag_dest_gtk.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 41ebc96..f1f6fff 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -33,8 +33,8 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/escape.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" using WebKit::WebContextMenuData; using WebKit::WebMediaPlayerAction; diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.h b/chrome/browser/tab_contents/web_drag_dest_gtk.h index 8bba71e..46e16aa 100644 --- a/chrome/browser/tab_contents/web_drag_dest_gtk.h +++ b/chrome/browser/tab_contents/web_drag_dest_gtk.h @@ -9,7 +9,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" #include "webkit/glue/webdropdata.h" class TabContents; |