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 /base/message_loop.cc | |
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 'base/message_loop.cc')
-rw-r--r-- | base/message_loop.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index cc7faa3..f60bf69 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -30,10 +30,11 @@ #if defined(OS_ANDROID) #include "base/message_pump_android.h" #endif -#if defined(TOOLKIT_USES_GTK) + +#if defined(TOOLKIT_GTK) #include <gdk/gdk.h> #include <gdk/gdkx.h> -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif using base::PendingTask; using base::TimeDelta; |