summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 02:17:49 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 02:17:49 +0000
commitc71fc77963db75fc518483dc38a1b4498499cb6f (patch)
tree2a521b4da36ceb110a7433ac3a710fd4050c3f80 /chrome/app
parent3ec656606fba81d634acf0dca14eb78b7e691902 (diff)
downloadchromium_src-c71fc77963db75fc518483dc38a1b4498499cb6f.zip
chromium_src-c71fc77963db75fc518483dc38a1b4498499cb6f.tar.gz
chromium_src-c71fc77963db75fc518483dc38a1b4498499cb6f.tar.bz2
Fixed aura dependencies to not include gtk but bring in
necessary X libraries BUG=97131 TEST=None Review URL: http://codereview.chromium.org/8118027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_main.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index a24e1b3..4d26172 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -79,10 +79,13 @@
#include "chrome/browser/chromeos/boot_times_loader.h"
#endif
-#if defined(USE_X11)
+#if defined(TOOLKIT_USES_GTK)
#include <gdk/gdk.h>
#include <glib.h>
#include <gtk/gtk.h>
+#endif
+
+#if defined(USE_X11)
#include <stdlib.h>
#include <string.h>
#include "ui/base/x/x11_util.h"