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

Unified Diff: content/renderer/renderer_main.cc

Issue 8414020: Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
Index: content/renderer/renderer_main.cc
===================================================================
--- content/renderer/renderer_main.cc (revision 107845)
+++ content/renderer/renderer_main.cc (working copy)
@@ -5,7 +5,6 @@
#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/i18n/rtl.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/field_trial.h"
#include "base/message_loop.h"
@@ -33,6 +32,7 @@
#include <unistd.h>
#include "base/mac/mac_util.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "third_party/mach_override/mach_override.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#endif // OS_MACOSX
@@ -124,10 +124,10 @@
int RendererMain(const MainFunctionParams& parameters) {
TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
- const CommandLine& parsed_command_line = parameters.command_line_;
- base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
+ const CommandLine& parsed_command_line = parameters.command_line;
#if defined(OS_MACOSX)
+ base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool;
InstallFrameworkHacks();
#endif // OS_MACOSX
@@ -222,8 +222,10 @@
startup_timer.Stop(); // End of Startup Time Measurement.
if (run_loop) {
+#if defined(OS_MACOSX)
if (pool)
pool->Recycle();
+#endif
TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
MessageLoop::current()->Run();
TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);

Powered by Google App Engine
This is Rietveld 408576698