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

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

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: Update #include guards 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "ppapi/native_client/src/trusted/plugin/plugin.h" 5 #include "components/nacl/renderer/plugin/plugin.h"
6 6
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "components/nacl/renderer/plugin/nacl_subprocess.h"
13 #include "components/nacl/renderer/plugin/plugin_error.h"
14 #include "components/nacl/renderer/plugin/service_runtime.h"
15 #include "components/nacl/renderer/plugin/utility.h"
12 #include "native_client/src/include/nacl_base.h" 16 #include "native_client/src/include/nacl_base.h"
13 #include "native_client/src/include/nacl_macros.h" 17 #include "native_client/src/include/nacl_macros.h"
14 #include "native_client/src/include/nacl_scoped_ptr.h" 18 #include "native_client/src/include/nacl_scoped_ptr.h"
15 #include "native_client/src/include/portability.h" 19 #include "native_client/src/include/portability.h"
16 #include "native_client/src/include/portability_io.h" 20 #include "native_client/src/include/portability_io.h"
17 #include "native_client/src/shared/platform/nacl_check.h" 21 #include "native_client/src/shared/platform/nacl_check.h"
18 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" 22 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
19
20 #include "ppapi/c/pp_errors.h" 23 #include "ppapi/c/pp_errors.h"
21 #include "ppapi/c/private/ppb_nacl_private.h" 24 #include "ppapi/c/private/ppb_nacl_private.h"
22 #include "ppapi/cpp/module.h" 25 #include "ppapi/cpp/module.h"
23 26
24 #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h"
25 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
26 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
27 #include "ppapi/native_client/src/trusted/plugin/utility.h"
28
29 namespace plugin { 27 namespace plugin {
30 28
31 namespace { 29 namespace {
32 30
33 // Up to 20 seconds 31 // Up to 20 seconds
34 const int64_t kTimeSmallMin = 1; // in ms 32 const int64_t kTimeSmallMin = 1; // in ms
35 const int64_t kTimeSmallMax = 20000; // in ms 33 const int64_t kTimeSmallMax = 20000; // in ms
36 const uint32_t kTimeSmallBuckets = 100; 34 const uint32_t kTimeSmallBuckets = 100;
37 35
38 } // namespace 36 } // namespace
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 } 366 }
369 } 367 }
370 368
371 void Plugin::ReportLoadError(const ErrorInfo& error_info) { 369 void Plugin::ReportLoadError(const ErrorInfo& error_info) {
372 nacl_interface_->ReportLoadError(pp_instance(), 370 nacl_interface_->ReportLoadError(pp_instance(),
373 error_info.error_code(), 371 error_info.error_code(),
374 error_info.message().c_str()); 372 error_info.message().c_str());
375 } 373 }
376 374
377 } // namespace plugin 375 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698