diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:38:22 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:38:22 +0000 |
| commit | 3cb95308104ebdba3027b54dd1051182def2f0a2 (patch) | |
| tree | 48c85c7924fe4968ce94034d78a8eccb12098f6b /chrome/nacl/nacl_main.cc | |
| parent | 845ca3d65a75ab814900860886c3585d21e74a38 (diff) | |
| download | chromium_src-3cb95308104ebdba3027b54dd1051182def2f0a2.zip chromium_src-3cb95308104ebdba3027b54dd1051182def2f0a2.tar.gz chromium_src-3cb95308104ebdba3027b54dd1051182def2f0a2.tar.bz2 | |
Rename NaClThread to NaClLauncherThread
This avoids a conflict with NaCl's own "struct NaClThread".
NaClLauncherThread is also a more descriptive name.
The goal is to be able to #include NaCl's sel_ldr.h so that we do not
have to duplicate the prototype for NaClMainForChromium(). However,
we cannot do that immediately because there is still a conflict
between NaCl's LOG_FATAL and Chromium's LOG_FATAL.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595
TEST=trybots
Review URL: http://codereview.chromium.org/6880074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_main.cc')
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index 548f21f..51c57b8 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,8 +15,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/sandbox_policy.h" +#include "chrome/nacl/nacl_launcher_thread.h" #include "chrome/nacl/nacl_main_platform_delegate.h" -#include "chrome/nacl/nacl_thread.h" #include "content/common/child_process.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" @@ -119,7 +119,7 @@ int NaClMain(const MainFunctionParams& parameters) { if (sandbox_test_result) { ChildProcess nacl_process; bool debug = parsed_command_line.HasSwitch(switches::kEnableNaClDebug); - nacl_process.set_main_thread(new NaClThread(debug)); + nacl_process.set_main_thread(new NaClLauncherThread(debug)); MessageLoop::current()->Run(); } else { // This indirectly prevents the test-harness-success-cookie from being set, |