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

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

Issue 1085583005: Refactor params of NaClProcessMsg_Start. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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
Index: components/nacl/renderer/json_manifest.cc
diff --git a/components/nacl/renderer/json_manifest.cc b/components/nacl/renderer/json_manifest.cc
index abcd92e20847dc55fe36010a2f372de68eb17854..6cab9b41039eefbc06b269011185f01612a5ee54 100644
--- a/components/nacl/renderer/json_manifest.cc
+++ b/components/nacl/renderer/json_manifest.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/macros.h"
+#include "components/nacl/common/nacl_types.h"
#include "components/nacl/renderer/nexe_load_manager.h"
#include "third_party/jsoncpp/source/include/json/reader.h"
#include "third_party/jsoncpp/source/include/json/value.h"
@@ -442,7 +443,8 @@ bool JsonManifest::GetProgramURL(std::string* full_url,
return true;
}
-void JsonManifest::GetPrefetchableFiles(base::StringPairs* out_files) const {
+void JsonManifest::GetPrefetchableFiles(
+ std::vector<NaClResourcePrefetchRequest>* out_files) const {
const Json::Value& files = dictionary_[kFilesKey];
if (!files.isObject())
return;
@@ -454,7 +456,7 @@ void JsonManifest::GetPrefetchableFiles(base::StringPairs* out_files) const {
// We skip invalid entries in "files".
if (GetKeyUrl(files, keys[i], &full_url, &unused_pnacl_options)) {
if (GURL(full_url).SchemeIs("chrome-extension"))
- out_files->push_back(std::make_pair(keys[i], full_url));
+ out_files->push_back(NaClResourcePrefetchRequest(keys[i], full_url));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698