diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 18:32:14 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 18:32:14 +0000 |
| commit | 6e64343accab0d5b5436645e40a36f5ff20d17ec (patch) | |
| tree | cbf33d783e15f8fcd27bd1c27b79046fac0fb4be /chrome/nacl/nacl_main.cc | |
| parent | ede729d4d7a1e6a1dc07d58e0fff2ca5cc6e7131 (diff) | |
| download | chromium_src-6e64343accab0d5b5436645e40a36f5ff20d17ec.zip chromium_src-6e64343accab0d5b5436645e40a36f5ff20d17ec.tar.gz chromium_src-6e64343accab0d5b5436645e40a36f5ff20d17ec.tar.bz2 | |
Final removal of the bad dependency of chrome/common on chrome/browser
Also convert app/gtk_dnd_util.h from a class to a namespace for consistency
with added app/gtk_util.h.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/669268
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_main.cc')
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index 88f7af8..a7325cd 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -21,6 +21,7 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/main_function_params.h" #include "chrome/common/result_codes.h" +#include "chrome/common/sandbox_policy.h" #if defined(OS_WIN) #include "chrome/nacl/broker_thread.h" #endif @@ -28,8 +29,6 @@ #ifdef _WIN64 -sandbox::BrokerServices* g_broker_services = NULL; - // main() routine for the NaCl broker process. // This is necessary for supporting NaCl in Chrome on Win64. int NaClBrokerMain(const MainFunctionParams& parameters) { @@ -54,7 +53,7 @@ int NaClBrokerMain(const MainFunctionParams& parameters) { sandbox::BrokerServices* broker_services = parameters.sandbox_info_.BrokerServices(); if (broker_services) { - g_broker_services = broker_services; + sandbox::InitBrokerServices(broker_services); if (!parsed_command_line.HasSwitch(switches::kNoSandbox)) { bool use_winsta = !parsed_command_line.HasSwitch( switches::kDisableAltWinstation); |