diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 18:29:31 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 18:29:31 +0000 |
commit | 754e5bc23b758ef3444dd7383822563e46da8405 (patch) | |
tree | 7f0530663551ecb8006beaae67090d012dba80cf /chrome/app/chrome_exe_main.cc | |
parent | 3183a2edce65aeb5d6ebfddb3f9dc7593ad9db30 (diff) | |
download | chromium_src-754e5bc23b758ef3444dd7383822563e46da8405.zip chromium_src-754e5bc23b758ef3444dd7383822563e46da8405.tar.gz chromium_src-754e5bc23b758ef3444dd7383822563e46da8405.tar.bz2 |
Remove #ifdef's used to support split dlls. Since we don't support
split dlls for now, remove these dead conditional compilations.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_exe_main.cc')
-rw-r--r-- | chrome/app/chrome_exe_main.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/app/chrome_exe_main.cc b/chrome/app/chrome_exe_main.cc index d95fab7..c124db3 100644 --- a/chrome/app/chrome_exe_main.cc +++ b/chrome/app/chrome_exe_main.cc @@ -41,10 +41,6 @@ #include "sandbox/src/sandbox_factory.h" #include "sandbox/src/dep.h" -// When defined, a different dll is loaded depending on the process type. -// Otherwise, the mighty chrome.dll is loaded. -//#define USE_SEPARATE_DLLS - int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance, wchar_t* command_line, int show_command) { // The exit manager is in charge of calling the dtors of singletons. @@ -64,23 +60,14 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev_instance, // For plugins, we enable ATL7 thunking support because we saw old activex // built with VC2002 in the wild still being used. sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED_ATL7_COMPAT); -#ifdef USE_SEPARATE_DLLS - dll_name = L"plugin.dll"; -#endif } else if (process_type == switches::kRendererProcess) { // Renderer process. // For the processes we control, we enforce strong DEP support. sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED); -#ifdef USE_SEPARATE_DLLS - dll_name = L"renderer.dll"; -#endif } else { // Browser process. // For the processes we control, we enforce strong DEP support. sandbox::SetCurrentProcessDEP(sandbox::DEP_ENABLED); -#ifdef USE_SEPARATE_DLLS - dll_name = L"browser.dll"; -#endif } // TODO(erikkay): Get guid from build macros rather than hardcoding. |