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

Unified Diff: chrome/service/service_main.cc

Issue 10512016: Get rid of internal content includes for sandbox code from chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: update deps! Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/nacl/nacl_main_platform_delegate_mac.mm ('k') | chrome/service/service_utility_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_main.cc
===================================================================
--- chrome/service/service_main.cc (revision 140351)
+++ chrome/service/service_main.cc (working copy)
@@ -11,7 +11,7 @@
#include "net/url_request/url_request.h"
#if defined(OS_WIN)
-#include "content/common/sandbox_policy.h"
+#include "content/public/common/sandbox_init.h"
#include "sandbox/src/sandbox_types.h"
#elif defined(OS_MACOSX)
#include "chrome/service/chrome_service_application_mac.h"
@@ -44,10 +44,7 @@
return 0;
#if defined(OS_WIN)
- sandbox::BrokerServices* broker_services =
- parameters.sandbox_info->broker_services;
- if (broker_services)
- sandbox::InitBrokerServices(broker_services);
+ content::InitializeSandbox(parameters.sandbox_info);
#endif // defined(OS_WIN)
ServiceProcess service_process;
« no previous file with comments | « chrome/nacl/nacl_main_platform_delegate_mac.mm ('k') | chrome/service/service_utility_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698