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

Side by Side Diff: components/nacl/renderer/plugin/pnacl_resources.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/pnacl_resources.h" 5 #include "components/nacl/renderer/plugin/pnacl_resources.h"
6 6
7 #include "components/nacl/renderer/plugin/plugin.h"
8 #include "components/nacl/renderer/plugin/utility.h"
7 #include "native_client/src/include/portability_io.h" 9 #include "native_client/src/include/portability_io.h"
8 #include "native_client/src/shared/platform/nacl_check.h" 10 #include "native_client/src/shared/platform/nacl_check.h"
9 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" 11 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
10 #include "ppapi/c/pp_errors.h" 12 #include "ppapi/c/pp_errors.h"
11 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
12 #include "ppapi/native_client/src/trusted/plugin/utility.h"
13 13
14 namespace plugin { 14 namespace plugin {
15 15
16 namespace { 16 namespace {
17 17
18 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/"; 18 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/";
19 19
20 std::string GetFullUrl(const std::string& partial_url) { 20 std::string GetFullUrl(const std::string& partial_url) {
21 return std::string(kPnaclBaseUrl) + GetNaClInterface()->GetSandboxArch() + 21 return std::string(kPnaclBaseUrl) + GetNaClInterface()->GetSandboxArch() +
22 "/" + partial_url; 22 "/" + partial_url;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // Do a blocking load of each of the resources. 71 // Do a blocking load of each of the resources.
72 plugin_->nacl_interface()->GetReadExecPnaclFd(llc_tool_name_.c_str(), 72 plugin_->nacl_interface()->GetReadExecPnaclFd(llc_tool_name_.c_str(),
73 &llc_file_info_); 73 &llc_file_info_);
74 plugin_->nacl_interface()->GetReadExecPnaclFd(ld_tool_name_.c_str(), 74 plugin_->nacl_interface()->GetReadExecPnaclFd(ld_tool_name_.c_str(),
75 &ld_file_info_); 75 &ld_file_info_);
76 return (llc_file_info_.handle != PP_kInvalidFileHandle && 76 return (llc_file_info_.handle != PP_kInvalidFileHandle &&
77 ld_file_info_.handle != PP_kInvalidFileHandle); 77 ld_file_info_.handle != PP_kInvalidFileHandle);
78 } 78 }
79 79
80 } // namespace plugin 80 } // namespace plugin
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698