Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: components/nacl/renderer/ppb_nacl_private_impl.cc

Issue 348323002: Use base::File for the OpenResourceCallback's argument. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl/renderer/manifest_service_channel.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index a2b0c43562b5f311717262a889bb539c481be01b..5e2f9fef13e86a1906c8d29b8b836e0a445cc7c0 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -13,6 +13,7 @@
#include "base/command_line.h"
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/cpu.h"
+#include "base/files/file.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/rand_util.h"
@@ -211,7 +212,7 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
if (!ManifestResolveKey(pp_instance_, false, key, &url, &pnacl_options)) {
base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback, PP_kInvalidFileHandle));
+ base::Bind(callback, base::Passed(base::File())));
return;
}
@@ -232,10 +233,10 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
int32_t pp_error,
const PP_NaClFileInfo& file_info) {
if (pp_error != PP_OK) {
- callback.Run(base::kInvalidPlatformFileValue);
+ callback.Run(base::File());
return;
}
- callback.Run(file_info.handle);
+ callback.Run(base::File(file_info.handle));
}
void Quit() {
« no previous file with comments | « components/nacl/renderer/manifest_service_channel.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698