diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 02:45:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 02:45:43 +0000 |
| commit | d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57 (patch) | |
| tree | 9fae17aca3536ca96737741724b782c189bd4e23 /chrome_frame | |
| parent | 770c714e651efbeef3507a3c177c619867c4f346 (diff) | |
| download | chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.zip chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.tar.gz chromium_src-d0fcff7b79fdc1b1931eb0e2e2da20ae8771ad57.tar.bz2 | |
reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child
Win x64 warning suppression, and allocator dependency on linux for shared_library build compared to previous land.
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/20003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/plugin_url_request.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h index 718741b..acfc49d 100644 --- a/chrome_frame/plugin_url_request.h +++ b/chrome_frame/plugin_url_request.h @@ -17,7 +17,7 @@ #include "net/base/host_port_pair.h" #include "net/base/upload_data.h" #include "net/url_request/url_request_status.h" -#include "webkit/glue/resource_type.h" +#include "webkit/common/resource_type.h" class PluginUrlRequest; class PluginUrlRequestDelegate; |