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

Side by Side Diff: components/nacl/renderer/json_manifest.h

Issue 310113002: Pepper: Move JsonManifestMap to json_manifest.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | components/nacl/renderer/json_manifest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H 5 #ifndef COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H
6 #define COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H 6 #define COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/memory/scoped_ptr.h"
11 #include "ppapi/c/pp_array_output.h" 12 #include "ppapi/c/pp_array_output.h"
13 #include "ppapi/c/pp_instance.h"
12 #include "ppapi/c/private/ppb_nacl_private.h" 14 #include "ppapi/c/private/ppb_nacl_private.h"
13 #include "third_party/jsoncpp/source/include/json/value.h" 15 #include "third_party/jsoncpp/source/include/json/value.h"
14 16
15 namespace nacl { 17 namespace nacl {
18 class JsonManifest;
16 class NexeLoadManager; 19 class NexeLoadManager;
17 20
21 // There is at most one JsonManifest per PP_Instance. This adds a one-to-one
22 // mapping.
23 void AddJsonManifest(PP_Instance instance, scoped_ptr<JsonManifest> manifest);
24
25 // Returns a non-owning pointer to the JsonManifest for the given instance.
26 // Returns NULL if no such JsonManifest exists.
27 JsonManifest* GetJsonManifest(PP_Instance instance);
28 void DeleteJsonManifest(PP_Instance instance);
29
18 class JsonManifest { 30 class JsonManifest {
19 public: 31 public:
20 struct ErrorInfo { 32 struct ErrorInfo {
21 PP_NaClError error; 33 PP_NaClError error;
22 std::string string; 34 std::string string;
23 }; 35 };
24 36
25 JsonManifest(const std::string& manifest_base_url, 37 JsonManifest(const std::string& manifest_base_url,
26 const std::string& sandbox_isa, 38 const std::string& sandbox_isa,
27 bool nonsfi_enabled, 39 bool nonsfi_enabled,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 bool nonsfi_enabled_; 76 bool nonsfi_enabled_;
65 bool pnacl_debug_; 77 bool pnacl_debug_;
66 78
67 // The dictionary of manifest information parsed in Init(). 79 // The dictionary of manifest information parsed in Init().
68 Json::Value dictionary_; 80 Json::Value dictionary_;
69 }; 81 };
70 82
71 } // namespace nacl 83 } // namespace nacl
72 84
73 #endif // COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H 85 #endif // COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H
OLDNEW
« no previous file with comments | « no previous file | components/nacl/renderer/json_manifest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698