diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 19:07:32 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 19:07:32 +0000 |
| commit | 8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25 (patch) | |
| tree | f0b0a823033c805c1090997b82f806f028c8d94e /o3d/plugin/npapi_host_control/win | |
| parent | 6513feea8262f7daa26132681c93e4229aa1d357 (diff) | |
| download | chromium_src-8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25.zip chromium_src-8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25.tar.gz chromium_src-8b8a8fd0d47835f8f90cd4d568a1697d1f8dec25.tar.bz2 | |
This updates the DEPS to bring them in line with the versions
that Chrome is currently using, and it removes "files" from the NPAPI
include paths and file location in third_party so that we can be consistent
with other Chrome third party directories.
TEST=build using gyp and scons and ran unit tests on each.
Review URL: http://codereview.chromium.org/159277
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/npapi_host_control/win')
6 files changed, 6 insertions, 6 deletions
diff --git a/o3d/plugin/npapi_host_control/win/dispatch_proxy.h b/o3d/plugin/npapi_host_control/win/dispatch_proxy.h index bb12cc8..64209ec 100644 --- a/o3d/plugin/npapi_host_control/win/dispatch_proxy.h +++ b/o3d/plugin/npapi_host_control/win/dispatch_proxy.h @@ -39,7 +39,7 @@ #include <atlctl.h> #include <dispex.h> -#include "third_party/npapi/files/include/npupp.h" +#include "third_party/npapi/include/npupp.h" #include "plugin/npapi_host_control/win/np_browser_proxy.h" class NPBrowserProxy; diff --git a/o3d/plugin/npapi_host_control/win/np_browser_proxy.h b/o3d/plugin/npapi_host_control/win/np_browser_proxy.h index 19f3245..e245c84 100644 --- a/o3d/plugin/npapi_host_control/win/np_browser_proxy.h +++ b/o3d/plugin/npapi_host_control/win/np_browser_proxy.h @@ -47,7 +47,7 @@ #include <dispex.h> #include <map> -#include "third_party/npapi/files/include/npupp.h" +#include "third_party/npapi/include/npupp.h" #include "plugin/npapi_host_control/win/dispatch_proxy.h" #include "plugin/npapi_host_control/win/np_object_proxy.h" diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc index da7f018..e75b421 100644 --- a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc +++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc @@ -38,7 +38,7 @@ #include "plugin/npapi_host_control/win/np_object_proxy.h" #include "plugin/npapi_host_control/win/np_browser_proxy.h" #include "plugin/npapi_host_control/win/variant_utils.h" -#include "third_party/npapi/files/include/npupp.h" +#include "third_party/npapi/include/npupp.h" namespace { diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.h b/o3d/plugin/npapi_host_control/win/np_object_proxy.h index 4d80676..4cf20c8 100644 --- a/o3d/plugin/npapi_host_control/win/np_object_proxy.h +++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.h @@ -44,7 +44,7 @@ // type-lib. #include "npapi_host_control.h" -#include "third_party/npapi/files/include/npupp.h" +#include "third_party/npapi/include/npupp.h" struct NPObject; class NPBrowserProxy; diff --git a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h index 0c81367..6f122d1 100644 --- a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h +++ b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h @@ -37,7 +37,7 @@ #define O3D_PLUGIN_NPAPI_HOST_CONTROL_WIN_NP_PLUGIN_PROXY_H_ #include <vector> -#include "third_party/npapi/files/include/npupp.h" +#include "third_party/npapi/include/npupp.h" class NPBrowserProxy; struct INPObjectProxy; diff --git a/o3d/plugin/npapi_host_control/win/stream_operation.h b/o3d/plugin/npapi_host_control/win/stream_operation.h index c74f436..25f35cb 100644 --- a/o3d/plugin/npapi_host_control/win/stream_operation.h +++ b/o3d/plugin/npapi_host_control/win/stream_operation.h @@ -49,7 +49,7 @@ #include <atlstr.h> #include <urlmon.h> -#include "third_party/npapi/files/include/npupp.h" +#include "third_party/npapi/include/npupp.h" class NPPluginProxy; |