diff --git a/chromium/content/app/content_main_runner.cc b/chromium/content/app/content_main_runner.cc index 5db69619305cd9cf13fc3e40cbc23a4b9e2c9ec8..1f1a5f351d5843400d393653744fbf3d98c7c56a 100644 --- a/chromium/content/app/content_main_runner.cc +++ b/chromium/content/app/content_main_runner.cc @@ -577,7 +577,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { } #endif // !OS_ANDROID && !OS_IOS -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(TOOLKIT_QT) // We need this pool for all the objects created before we get to the // event loop, but we don't want to leave them hanging around until the // app quits. Each "main" needs to flush this pool right before it goes into @@ -758,7 +758,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { main_params.ui_task = ui_task_; #if defined(OS_WIN) main_params.sandbox_info = &sandbox_info_; -#elif defined(OS_MACOSX) +#elif defined(OS_MACOSX) && !defined(TOOLKIT_QT) main_params.autorelease_pool = autorelease_pool_.get(); #endif @@ -787,7 +787,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { #endif // _CRTDBG_MAP_ALLOC #endif // OS_WIN -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(TOOLKIT_QT) autorelease_pool_.reset(NULL); #endif @@ -816,7 +816,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { scoped_ptr<base::AtExitManager> exit_manager_; #if defined(OS_WIN) sandbox::SandboxInterfaceInfo sandbox_info_; -#elif defined(OS_MACOSX) +#elif defined(OS_MACOSX) && !defined(TOOLKIT_QT) scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_; #endif