diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 02:18:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 02:18:23 +0000 |
| commit | 711f428ee4902672583deb28eb8002308e16c1d4 (patch) | |
| tree | fa2055aed0fa9dbfa24d3dbef22f9a7d096ae9ae /content/public/app | |
| parent | 9613eacf26ab9f04831a88a8a90831020b548918 (diff) | |
| download | chromium_src-711f428ee4902672583deb28eb8002308e16c1d4.zip chromium_src-711f428ee4902672583deb28eb8002308e16c1d4.tar.gz chromium_src-711f428ee4902672583deb28eb8002308e16c1d4.tar.bz2 | |
Undo the startup_helper_win.h change in r143501 because that breaks the sandbox in component builds.
Review URL: https://chromiumcodereview.appspot.com/10638010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/app')
| -rw-r--r-- | content/public/app/startup_helper_win.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/public/app/startup_helper_win.h b/content/public/app/startup_helper_win.h index 7bb3d68..0dcdc61 100644 --- a/content/public/app/startup_helper_win.h +++ b/content/public/app/startup_helper_win.h @@ -6,8 +6,6 @@ #define CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_ #pragma once -#include "content/common/content_export.h" - class CommandLine; namespace sandbox { @@ -16,13 +14,15 @@ struct SandboxInterfaceInfo; // This file contains functions that any embedder that's not using ContentMain // will want to call at startup. +// NOTE: we never want to CONTENT_EXPORT these functions, they must run in the +// same module that calls them. namespace content { // Initializes the sandbox code and turns on DEP. Note: This function // must be *statically* linked into the executable (along with the static // sandbox library); it will not work correctly if it is exported from a // DLL and linked in. -CONTENT_EXPORT void InitializeSandboxInfo( +void InitializeSandboxInfo( sandbox::SandboxInterfaceInfo* sandbox_info); // Register the invalid param handler and pure call handler to be able to |