diff options
| author | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 22:01:38 +0000 |
|---|---|---|
| committer | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 22:01:38 +0000 |
| commit | ed3eb462ba5584dabfa47461e676cb89da921838 (patch) | |
| tree | 63e1021a3baf635dfcb61264f41d48e8b60d3dfb /ppapi | |
| parent | 504830a643d3aa2e31d46f4668fb7b10d28e8da5 (diff) | |
| download | chromium_src-ed3eb462ba5584dabfa47461e676cb89da921838.zip chromium_src-ed3eb462ba5584dabfa47461e676cb89da921838.tar.gz chromium_src-ed3eb462ba5584dabfa47461e676cb89da921838.tar.bz2 | |
Change to using nacl_file_info.h from src/public instead.
Attempting to move the header from src/trusted/validator into src/public:
https://codereview.chromium.org/261683002/diff/310001/src/trusted/validator/nacl_file_info.h
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3421
Review URL: https://codereview.chromium.org/292213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
4 files changed, 3 insertions, 4 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/DEPS b/ppapi/native_client/src/trusted/plugin/DEPS index 8f7ae24..f92c0b3 100644 --- a/ppapi/native_client/src/trusted/plugin/DEPS +++ b/ppapi/native_client/src/trusted/plugin/DEPS @@ -6,6 +6,5 @@ include_rules = [ "+native_client/src/trusted/reverse_service/reverse_service.h", "+native_client/src/trusted/service_runtime/include", "+native_client/src/trusted/service_runtime/nacl_error_code.h", - "+native_client/src/trusted/validator/nacl_file_info.h", "+third_party/jsoncpp", ] diff --git a/ppapi/native_client/src/trusted/plugin/file_downloader.h b/ppapi/native_client/src/trusted/plugin/file_downloader.h index fa70a70..e5a9062 100644 --- a/ppapi/native_client/src/trusted/plugin/file_downloader.h +++ b/ppapi/native_client/src/trusted/plugin/file_downloader.h @@ -9,7 +9,7 @@ #include "native_client/src/include/nacl_macros.h" #include "native_client/src/include/nacl_string.h" -#include "native_client/src/trusted/validator/nacl_file_info.h" +#include "native_client/src/public/nacl_file_info.h" #include "ppapi/c/private/pp_file_handle.h" #include "ppapi/c/private/ppb_file_io_private.h" #include "ppapi/c/private/ppb_nacl_private.h" diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h index be366c5..f732f05 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.h +++ b/ppapi/native_client/src/trusted/plugin/plugin.h @@ -19,7 +19,7 @@ #include "native_client/src/include/nacl_macros.h" #include "native_client/src/include/nacl_scoped_ptr.h" #include "native_client/src/include/nacl_string.h" -#include "native_client/src/trusted/validator/nacl_file_info.h" +#include "native_client/src/public/nacl_file_info.h" #include "ppapi/c/private/ppb_nacl_private.h" #include "ppapi/cpp/instance.h" diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc index 063bb91..750f809d 100644 --- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc +++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc @@ -34,8 +34,8 @@ #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" #include "native_client/src/public/imc_types.h" +#include "native_client/src/public/nacl_file_info.h" #include "native_client/src/trusted/service_runtime/nacl_error_code.h" -#include "native_client/src/trusted/validator/nacl_file_info.h" #include "ppapi/c/pp_errors.h" #include "ppapi/cpp/core.h" |