diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:34:51 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:34:51 +0000 |
| commit | cf1d779fbf1582c77df145de5ec02cd7a9f25612 (patch) | |
| tree | 37810ddc0425638b2b6a86fd2f08da041c5f4500 /ipc/ipc_channel.cc | |
| parent | 3420503c0eb45fb0a2f8ec6316acbe9409f4c361 (diff) | |
| download | chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.zip chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.tar.gz chromium_src-cf1d779fbf1582c77df145de5ec02cd7a9f25612.tar.bz2 | |
Add untrusted NaCl build for PPAPI proxy.
This patch refactors ppapi_shared.gypi and ppapi_proxy.gypi into proper includes, adds ppapi_shared_untrusted and ppapi_proxy_untrusted .gyp files, and integrates them into the nacl_irt build (ppapi/native_client/native_client.gyp). In order to build without link errors, it includes our plugin side initialization of PluginDispatcher, and a PpapiPluginMain definition. When the 'build_ppapi_ipc_proxy_untrusted' gyp flag is set to '1', this will build a working NaCl IRT using the Chrome IPC proxy.
BUG=116317
TEST=compiles, runs HelloWorld and GetURL SDK examples.
Review URL: https://chromiumcodereview.appspot.com/10546140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel.cc')
| -rw-r--r-- | ipc/ipc_channel.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ipc/ipc_channel.cc b/ipc/ipc_channel.cc index d81d73b..94e1cc4 100644 --- a/ipc/ipc_channel.cc +++ b/ipc/ipc_channel.cc @@ -30,16 +30,15 @@ std::string Channel::GenerateUniqueRandomChannelID() { // component. The strong random component prevents other processes from // hijacking or squatting on predictable channel names. - int process_id; #if !defined(OS_NACL) - process_id = base::GetCurrentProcId(); -#else - process_id = 0; -#endif + int process_id = base::GetCurrentProcId(); return base::StringPrintf("%d.%u.%d", process_id, g_last_id.GetNext(), base::RandInt(0, std::numeric_limits<int32>::max())); +#else + return std::string(); +#endif } } // namespace IPC |