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

Unified Diff: content/utility/utility_thread_impl.cc

Issue 34123003: Utility process: initialize GTK when the sandbox is disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix non-GTK compile. Created 7 years, 2 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
« no previous file with comments | « content/utility/utility_main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/utility/utility_thread_impl.cc
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index ca03da4098122c1486967ddd8aa3882f35016dae..ed7fbfe4a3fb7af959f9f0b6607d50b4cadba262 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -19,12 +19,6 @@
#include "ipc/ipc_sync_channel.h"
#include "third_party/WebKit/public/web/WebKit.h"
-#if defined(TOOLKIT_GTK)
-#include <gtk/gtk.h>
-
-#include "ui/gfx/gtk_util.h"
-#endif
-
namespace content {
namespace {
@@ -132,19 +126,6 @@ void UtilityThreadImpl::OnLoadPlugins(
const std::vector<base::FilePath>& plugin_paths) {
PluginList* plugin_list = PluginList::Singleton();
- // On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
- // before attempting to call into the plugin.
- // g_thread_init API is deprecated since glib 2.31.0, please see release note:
- // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
-#if defined(TOOLKIT_GTK)
-#if !(GLIB_CHECK_VERSION(2, 31, 0))
- if (!g_thread_get_initialized()) {
- g_thread_init(NULL);
- }
-#endif
- gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
-#endif
-
std::vector<WebPluginInfo> plugins;
// TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in
// PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins
« no previous file with comments | « content/utility/utility_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698