From 418ed5ab9cd81a2106893fce7aa121f693c6a98f Mon Sep 17 00:00:00 2001 From: "yaar@chromium.org" Date: Thu, 12 Nov 2009 01:14:49 +0000 Subject: 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 --- chrome/browser/tab_contents/render_view_context_menu.cc | 4 ++-- chrome/browser/tab_contents/web_drag_dest_gtk.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/tab_contents') 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; -- cgit v1.1