Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1795)

Unified Diff: content/utility/utility_main.cc

Issue 231733005: Delete the GTK+ port of Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remerge to ToT Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/utility/utility_main.cc
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc
index a522427b6e73856f5bca2ea4bbf534d5eec24639..a57ea9c88e9a53f86deed9e2b5b7cb36007f1d1b 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());

Powered by Google App Engine
This is Rietveld 408576698