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/plugin | |
| 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/plugin')
| -rw-r--r-- | content/plugin/plugin_thread.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index b5fec37..9b88420 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include <gtk/gtk.h> #elif defined(OS_MACOSX) #include <CoreFoundation/CoreFoundation.h> @@ -31,7 +31,7 @@ #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_util.h" #endif @@ -78,7 +78,7 @@ PluginThread::PluginThread() lazy_tls.Pointer()->Set(this); #if defined(USE_AURA) // TODO(saintlou): -#elif defined(TOOLKIT_USES_GTK) +#elif defined(TOOLKIT_GTK) { // XEmbed plugins assume they are hosted in a Gtk application, so we need // to initialize Gtk in the plugin process. |