diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 00:05:58 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 00:05:58 +0000 |
| commit | 5e557a2246cbf79caeec1dc0b0e277821c2bb1dc (patch) | |
| tree | ea592c70c8c107bbfad315a03ffc76189522f150 /content | |
| parent | 962d46c393b425ba908d1e9d56eb711049a9a698 (diff) | |
| download | chromium_src-5e557a2246cbf79caeec1dc0b0e277821c2bb1dc.zip chromium_src-5e557a2246cbf79caeec1dc0b0e277821c2bb1dc.tar.gz chromium_src-5e557a2246cbf79caeec1dc0b0e277821c2bb1dc.tar.bz2 | |
export RendererMain from content so that it will get picked up properly by chrome_main.
R=jam@chromium.org
BUG=90442
Review URL: http://codereview.chromium.org/7841009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/app/content_main.cc | 2 | ||||
| -rw-r--r-- | content/common/content_export.h | 5 | ||||
| -rw-r--r-- | content/renderer/renderer_main.cc | 2 | ||||
| -rw-r--r-- | content/renderer/renderer_main.h | 16 |
4 files changed, 22 insertions, 3 deletions
diff --git a/content/app/content_main.cc b/content/app/content_main.cc index 9d388a2..b124193 100644 --- a/content/app/content_main.cc +++ b/content/app/content_main.cc @@ -23,6 +23,7 @@ #include "content/common/main_function_params.h" #include "content/common/sandbox_init_wrapper.h" #include "content/common/set_process_title.h" +#include "content/renderer/renderer_main.h" #include "crypto/nss_util.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" @@ -57,7 +58,6 @@ int tc_set_new_mode(int mode); #endif extern int BrowserMain(const MainFunctionParams&); -extern int RendererMain(const MainFunctionParams&); extern int GpuMain(const MainFunctionParams&); extern int PluginMain(const MainFunctionParams&); extern int PpapiPluginMain(const MainFunctionParams&); diff --git a/content/common/content_export.h b/content/common/content_export.h index c52377f..dd76009 100644 --- a/content/common/content_export.h +++ b/content/common/content_export.h @@ -6,7 +6,8 @@ #define CONTENT_COMMON_CONTENT_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +// TODO(dpranke): Uncomment to enable component build of content. +#if 0 // defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(CONTENT_IMPLEMENTATION) @@ -16,7 +17,7 @@ #endif // defined(CONTENT_IMPLEMENTATION) #else // defined(WIN32) -#define CONTENT_EXPORT __attribute__((visibility("default")) +#define CONTENT_EXPORT __attribute__((visibility("default"))) #endif #else // defined(COMPONENT_BUILD) diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 2c1937b..e3b2fab 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/renderer/renderer_main.h" + #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/i18n/rtl.h" diff --git a/content/renderer/renderer_main.h b/content/renderer/renderer_main.h new file mode 100644 index 0000000..a830c88 --- /dev/null +++ b/content/renderer/renderer_main.h @@ -0,0 +1,16 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_RENDERER_RENDERER_MAIN_H_ +#define CONTENT_RENDERER_RENDERER_MAIN_H_ +#pragma once + +#include "content/common/content_export.h" + +struct MainFunctionParams; + +// This is the mainline routine for running as the Renderer process. +CONTENT_EXPORT int RendererMain(const MainFunctionParams& parameters); + +#endif // CONTENT_RENDERER_RENDERER_MAIN_H_ |