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 /gpu | |
| 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 'gpu')
| -rw-r--r-- | gpu/demos/framework/main_exe.cc | 8 | ||||
| -rw-r--r-- | gpu/gles2_conform_support/native/main.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gpu/demos/framework/main_exe.cc b/gpu/demos/framework/main_exe.cc index 296d164..12d3828 100644 --- a/gpu/demos/framework/main_exe.cc +++ b/gpu/demos/framework/main_exe.cc @@ -8,9 +8,9 @@ #include "gpu/demos/framework/window.h" #include "ui/gfx/gl/gl_surface.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include <gtk/gtk.h> -#endif // TOOLKIT_USES_GTK +#endif // TOOLKIT_GTK namespace { static const int kWindowWidth = 512; @@ -18,9 +18,9 @@ static const int kWindowHeight = 512; } // namespace. int main(int argc, char** argv) { -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) gtk_init(&argc, &argv); -#endif // TOOLKIT_USES_GTK +#endif // TOOLKIT_GTK // AtExitManager is used by singleton classes to delete themselves when // the program terminates. diff --git a/gpu/gles2_conform_support/native/main.cc b/gpu/gles2_conform_support/native/main.cc index fd3dc75..99d9858 100644 --- a/gpu/gles2_conform_support/native/main.cc +++ b/gpu/gles2_conform_support/native/main.cc @@ -5,7 +5,7 @@ #include "base/at_exit.h" #include "base/message_loop.h" -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) #include <gtk/gtk.h> #endif @@ -18,7 +18,7 @@ extern "C" { } int main(int argc, char *argv[]) { -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) gtk_init(&argc, &argv); #endif |