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/renderer/extensions | |
| 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/renderer/extensions')
| -rw-r--r-- | chrome/renderer/extensions/bindings_utils.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/chrome_app_bindings.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/event_bindings.cc | 12 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 1cc5285..82c313f 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -8,7 +8,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "chrome/renderer/render_view.h" -#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/extensions/chrome_app_bindings.cc b/chrome/renderer/extensions/chrome_app_bindings.cc index 23d99b0..647f9d5 100644 --- a/chrome/renderer/extensions/chrome_app_bindings.cc +++ b/chrome/renderer/extensions/chrome_app_bindings.cc @@ -10,7 +10,7 @@ #include "chrome/renderer/extensions/extension_renderer_info.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" using WebKit::WebFrame; diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 4f95ac7..0e38dce 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -17,12 +17,12 @@ #include "chrome/renderer/render_view.h" #include "googleurl/src/gurl.h" #include "grit/renderer_resources.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/WebSecurityOrigin.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/WebView.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.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 d8a7737..b37a773 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -33,11 +33,11 @@ #include "grit/renderer_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.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" -#include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" using bindings_utils::GetStringResource; using bindings_utils::ContextInfo; |