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

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

Issue 911463003: NaCl cleanup: Move ppb_nacl_private.h into components/nacl/renderer/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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
« no previous file with comments | « components/nacl/renderer/histogram.h ('k') | components/nacl/renderer/manifest_downloader.h » ('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 "components/nacl/renderer/ppb_nacl_private.h"
11 #include "ppapi/c/pp_array_output.h" 12 #include "ppapi/c/pp_array_output.h"
12 #include "ppapi/c/private/ppb_nacl_private.h"
13 #include "third_party/jsoncpp/source/include/json/value.h" 13 #include "third_party/jsoncpp/source/include/json/value.h"
14 14
15 namespace nacl { 15 namespace nacl {
16 class JsonManifest; 16 class JsonManifest;
17 class NexeLoadManager; 17 class NexeLoadManager;
18 18
19 class JsonManifest { 19 class JsonManifest {
20 public: 20 public:
21 struct ErrorInfo { 21 struct ErrorInfo {
22 PP_NaClError error; 22 PP_NaClError error;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool nonsfi_enabled_; 65 bool nonsfi_enabled_;
66 bool pnacl_debug_; 66 bool pnacl_debug_;
67 67
68 // The dictionary of manifest information parsed in Init(). 68 // The dictionary of manifest information parsed in Init().
69 Json::Value dictionary_; 69 Json::Value dictionary_;
70 }; 70 };
71 71
72 } // namespace nacl 72 } // namespace nacl
73 73
74 #endif // COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H 74 #endif // COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H
OLDNEW
« no previous file with comments | « components/nacl/renderer/histogram.h ('k') | components/nacl/renderer/manifest_downloader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698