diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 00:29:15 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 00:29:15 +0000 |
| commit | a25e36ecc653035fb06dc5a69b86eaceb18db6dd (patch) | |
| tree | c65098f119c93e78912f055988ddb633b2f24336 /chrome/browser/browser_main.cc | |
| parent | e0911d55207719cc45b657ec710ff605a7b26f43 (diff) | |
| download | chromium_src-a25e36ecc653035fb06dc5a69b86eaceb18db6dd.zip chromium_src-a25e36ecc653035fb06dc5a69b86eaceb18db6dd.tar.gz chromium_src-a25e36ecc653035fb06dc5a69b86eaceb18db6dd.tar.bz2 | |
Revert r17575 and r17576. They are causing layout test errors.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 0b4ffc3..f7145a4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -64,7 +64,6 @@ #if defined(OS_LINUX) #include "chrome/app/breakpad_linux.h" -#include "chrome/browser/renderer_host/render_sandbox_host_linux.h" #endif // TODO(port): several win-only methods have been pulled out of this, but @@ -219,8 +218,6 @@ void AddFirstRunNewTabs(BrowserInit* browser_init, } // namespace -extern void SkiaFontConfigUseDirectImplementation(); - // Main routine for running as the Browser process. int BrowserMain(const MainFunctionParams& parameters) { const CommandLine& parsed_command_line = parameters.command_line_; @@ -249,14 +246,6 @@ int BrowserMain(const MainFunctionParams& parameters) { CHECK(sigaction(SIGCHLD, &action, NULL) == 0); #endif -#if defined(OS_LINUX) - // Construct the sandbox host on the UI thread. - Singleton<RenderSandboxHostLinux>::get(); - - // Configure Skia in this process to use fontconfig directly. - SkiaFontConfigUseDirectImplementation(); -#endif - // Do platform-specific things (such as finishing initializing Cocoa) // prior to instantiating the message loop. This could be turned into a // broadcast notification. |