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

Unified Diff: content/utility/utility_thread_impl.cc

Issue 9773024: This patch implements Chromium's Aura gesture recognizer in terms of utouch-grail and utouch-frame … (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « content/plugin/plugin_thread.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/utility/utility_thread_impl.cc
===================================================================
--- content/utility/utility_thread_impl.cc (revision 126124)
+++ content/utility/utility_thread_impl.cc (working copy)
@@ -137,11 +137,16 @@
// On Linux, some plugins expect the browser to have loaded glib/gtk. Do that
// before attempting to call into the plugin.
#if defined(TOOLKIT_USES_GTK)
+ // g_thread_init is deprecated since gtk version 2.32
+#if (GTK_VERSION_MAJOR == 2 && GTK_VERSION_MINOR < 32)
if (!g_thread_get_initialized()) {
g_thread_init(NULL);
gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
}
+#else
+ gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
#endif
+#endif
for (size_t i = 0; i < plugin_paths.size(); ++i) {
ScopedVector<webkit::npapi::PluginGroup> plugin_groups;
« no previous file with comments | « content/plugin/plugin_thread.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698