diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 22:20:52 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 22:20:52 +0000 |
commit | dcc2977772bdd296d8bfbcaedafd4441def78e3d (patch) | |
tree | cb0bdc148cff3f5a221b89ad2c055212d58bb976 /content/utility | |
parent | 404d9a54ceae52b741b3e173af12fb7fd21c8548 (diff) | |
download | chromium_src-dcc2977772bdd296d8bfbcaedafd4441def78e3d.zip chromium_src-dcc2977772bdd296d8bfbcaedafd4441def78e3d.tar.gz chromium_src-dcc2977772bdd296d8bfbcaedafd4441def78e3d.tar.bz2 |
Delete the GTK+ port of Chrome.
BUG=297026
R=ben@chromium.org
Review URL: https://codereview.chromium.org/231733005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
-rw-r--r-- | content/utility/utility_main.cc | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc index a522427..a57ea9c 100644 --- a/content/utility/utility_main.cc +++ b/content/utility/utility_main.cc @@ -18,12 +18,6 @@ #include "sandbox/win/src/sandbox.h" #endif -#if defined(TOOLKIT_GTK) -#include <gtk/gtk.h> - -#include "ui/gfx/gtk_util.h" -#endif - namespace content { // Mainline routine for running as the utility process. @@ -39,34 +33,6 @@ int UtilityMain(const MainFunctionParams& parameters) { LinuxSandbox::InitializeSandbox(); #endif -#if defined(OS_POSIX) - // The utility process is used to load plugins (see OnLoadPlugins() in - // utility_thread_impl.cc). Some plugins expect the browser to have loaded - // GLib/GTK. - // Due to bugs in GLib we need to initialize GLib/GTK before we start threads, - // see crbug.com/309093. - -#if defined(TOOLKIT_GTK) - bool is_sandboxed = false; - -#if defined(OS_LINUX) - // On Linux, we only initialize GLib/GTK if we're not sandboxed. - is_sandboxed = !parameters.command_line.HasSwitch(switches::kNoSandbox); -#endif - - if (!is_sandboxed) { - // g_thread_init() is deprecated since glib 2.31.0, please see release note: - // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html -#if !(GLIB_CHECK_VERSION(2, 31, 0)) - if (!g_thread_get_initialized()) { - g_thread_init(NULL); - } -#endif - gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); - } -#endif -#endif - ChildProcess utility_process; utility_process.set_main_thread(new UtilityThreadImpl()); |