diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
| commit | a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5 (patch) | |
| tree | 2cb114cfcd3d89203d045c56ec2af4d2d52cf9b0 /content/utility | |
| parent | b09be0a7dace2e86516a2661c9c504d640abed7c (diff) | |
| download | chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.zip chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.gz chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.bz2 | |
Remove TOOLKIT_USES_GTK and consolidate it into TOOLKIT_GTK
Add gtk dependency to base.gyp for android host_os="linux" case
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9969080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
| -rw-r--r-- | content/utility/utility_thread_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index cf85fbd..b93eb54 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -21,7 +21,7 @@ #include "webkit/glue/idb_bindings.h" #include "webkit/plugins/npapi/plugin_list.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include <gtk/gtk.h> #include "ui/gfx/gtk_util.h" @@ -138,7 +138,7 @@ void UtilityThreadImpl::OnLoadPlugins( // 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_USES_GTK) +#if defined(TOOLKIT_GTK) #if !(GLIB_CHECK_VERSION(2, 31, 0)) if (!g_thread_get_initialized()) { g_thread_init(NULL); |