From badf5cf5f14c65f6c799ef1fec77cde8351339c2 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Sat, 29 Oct 2011 03:44:44 +0000 Subject: Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing this. -got rid of SandboxInitWrapper, since I didn't see a need to expose given that we can just expose sandbox::SandboxInterfaceInfo -got rid of the duplicated code to initialize the broker -since I made MainFunctionParams only have the sandbox struct on Windows, I also made the mac specific auto release pool behind an ifdef as well. It seemed odd to make something so mac specific compile on all platforms to save some #ifdefs. BUG=98716 Review URL: http://codereview.chromium.org/8414020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107863 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_main_loop.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'content/browser/browser_main_loop.cc') diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index f9b1102..ff12449 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -149,7 +149,7 @@ namespace content { BrowserMainLoop::BrowserMainLoop(const MainFunctionParams& parameters) : parameters_(parameters), - parsed_command_line_(parameters.command_line_), + parsed_command_line_(parameters.command_line), result_code_(content::RESULT_CODE_NORMAL_EXIT) { #if defined(OS_WIN) OleInitialize(NULL); @@ -332,7 +332,7 @@ void BrowserMainLoop::InitializeToolkit() { #endif #if !defined(USE_AURA) - gfx::GtkInitFromCommandLine(parameters_.command_line_); + gfx::GtkInitFromCommandLine(parameters_.command_line); #endif SetUpGLibLogHandler(); -- cgit v1.1