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

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

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase + #include order 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
OLDNEW
1 // -*- c++ -*- 1 // -*- c++ -*-
2 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 // Use of this source code is governed by a BSD-style license that can be 3 // Use of this source code is governed by a BSD-style license that can be
4 // found in the LICENSE file. 4 // found in the LICENSE file.
5 5
6 // The portable representation of an instance and root scriptable object. 6 // The portable representation of an instance and root scriptable object.
7 // The PPAPI version of the plugin instantiates a subclass of this class. 7 // The PPAPI version of the plugin instantiates a subclass of this class.
8 8
9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
11 11
12 #include <stdio.h> 12 #include <stdio.h>
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "components/nacl/renderer/plugin/nacl_subprocess.h"
17 #include "components/nacl/renderer/plugin/pnacl_coordinator.h"
18 #include "components/nacl/renderer/plugin/service_runtime.h"
19 #include "components/nacl/renderer/plugin/utility.h"
16 #include "native_client/src/include/nacl_macros.h" 20 #include "native_client/src/include/nacl_macros.h"
17 #include "native_client/src/include/nacl_scoped_ptr.h" 21 #include "native_client/src/include/nacl_scoped_ptr.h"
18
19 #include "ppapi/c/private/ppb_nacl_private.h" 22 #include "ppapi/c/private/ppb_nacl_private.h"
20 #include "ppapi/cpp/instance.h" 23 #include "ppapi/cpp/instance.h"
21 #include "ppapi/cpp/private/uma_private.h" 24 #include "ppapi/cpp/private/uma_private.h"
22 #include "ppapi/cpp/url_loader.h" 25 #include "ppapi/cpp/url_loader.h"
23 #include "ppapi/cpp/var.h" 26 #include "ppapi/cpp/var.h"
24 #include "ppapi/cpp/view.h" 27 #include "ppapi/cpp/view.h"
25
26 #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h"
27 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"
28 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
29 #include "ppapi/native_client/src/trusted/plugin/utility.h"
30
31 #include "ppapi/utility/completion_callback_factory.h" 28 #include "ppapi/utility/completion_callback_factory.h"
32 29
33 namespace nacl { 30 namespace nacl {
34 class DescWrapper; 31 class DescWrapper;
35 class DescWrapperFactory; 32 class DescWrapperFactory;
36 } // namespace nacl 33 } // namespace nacl
37 34
38 namespace pp { 35 namespace pp {
39 class CompletionCallback; 36 class CompletionCallback;
40 class URLLoader; 37 class URLLoader;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 175
179 PP_NaClFileInfo nexe_file_info_; 176 PP_NaClFileInfo nexe_file_info_;
180 177
181 const PPB_NaCl_Private* nacl_interface_; 178 const PPB_NaCl_Private* nacl_interface_;
182 pp::UMAPrivate uma_interface_; 179 pp::UMAPrivate uma_interface_;
183 }; 180 };
184 181
185 } // namespace plugin 182 } // namespace plugin
186 183
187 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_ 184 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698