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

Unified Diff: content/renderer/renderer_main.cc

Issue 7006006: Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 7 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 | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/renderer_webkitclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 2551e145b827d9568d31b827b6105272b8713a17..9ce70b516422e3d534d1c19d34c878d244788e75 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -207,7 +207,7 @@ int RendererMain(const MainFunctionParams& parameters) {
PepperPluginRegistry::GetInstance();
{
-#if !defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX)
// TODO(markus): Check if it is OK to unconditionally move this
// instruction down.
RenderProcessImpl render_process;
@@ -219,7 +219,7 @@ int RendererMain(const MainFunctionParams& parameters) {
} else {
LOG(ERROR) << "Running without renderer sandbox";
}
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
RenderProcessImpl render_process;
render_process.set_main_thread(new RenderThread());
#endif
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/renderer_webkitclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698