diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-17 06:44:37 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-17 06:44:37 +0000 |
| commit | 8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60 (patch) | |
| tree | 605e02a07a66e61c4fb1f645b2f87da200d56fd8 /chrome/browser/tab_contents | |
| parent | e65e8bac10ca2828444a5cffb8890fe065bc06fa (diff) | |
| download | chromium_src-8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60.zip chromium_src-8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60.tar.gz chromium_src-8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60.tar.bz2 | |
Roll WebKit DEPS past WebKit move. Update gyp files and include paths to reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 9f6f00c..547bf27 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -53,9 +53,9 @@ #include "net/base/escape.h" #include "net/url_request/url_request.h" #include "webkit/glue/webmenuitem.h" -#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" -#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" -#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" using WebKit::WebContextMenuData; using WebKit::WebMediaPlayerAction; diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h index d4ea3a3..9199336 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h @@ -12,7 +12,7 @@ #include "chrome/browser/dom_ui/dom_ui_factory.h" #include "chrome/common/window_container_type.h" #include "gfx/rect.h" -#include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index b73ef97..0de1784 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -102,7 +102,7 @@ #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" -#include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/password_form.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/glue/webpreferences.h" diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.h b/chrome/browser/tab_contents/web_drag_dest_gtk.h index 4b85f9f..ef59559 100644 --- a/chrome/browser/tab_contents/web_drag_dest_gtk.h +++ b/chrome/browser/tab_contents/web_drag_dest_gtk.h @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" -#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include "webkit/glue/webdropdata.h" class TabContents; diff --git a/chrome/browser/tab_contents/web_drag_utils_win.h b/chrome/browser/tab_contents/web_drag_utils_win.h index caa18750..5ab311c 100644 --- a/chrome/browser/tab_contents/web_drag_utils_win.h +++ b/chrome/browser/tab_contents/web_drag_utils_win.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_TAB_CONTENTS_WEB_DRAG_UTILS_WIN_H_ #pragma once -#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" #include <windows.h> diff --git a/chrome/browser/tab_contents/web_drop_target_win.h b/chrome/browser/tab_contents/web_drop_target_win.h index 7125b4b..f2c9541 100644 --- a/chrome/browser/tab_contents/web_drop_target_win.h +++ b/chrome/browser/tab_contents/web_drop_target_win.h @@ -8,7 +8,7 @@ #include "app/win/drop_target.h" #include "base/scoped_ptr.h" -#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" class InterstitialDropTarget; class RenderViewHost; |