summaryrefslogtreecommitdiffstats
path: root/chrome/test/automated_ui_tests
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 03:33:44 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 03:33:44 +0000
commit134c47b9e74ab7aa6dce7e1beeaf5e406a925b76 (patch)
treef4db8cfc40f3eb8a66421ee415f575cf6a76d638 /chrome/test/automated_ui_tests
parentcf5811e922d5aa215a4094bd88e70c38c6ddc57c (diff)
downloadchromium_src-134c47b9e74ab7aa6dce7e1beeaf5e406a925b76.zip
chromium_src-134c47b9e74ab7aa6dce7e1beeaf5e406a925b76.tar.gz
chromium_src-134c47b9e74ab7aa6dce7e1beeaf5e406a925b76.tar.bz2
Relands drop support:
Adds drop support for views on gtk. As X lazily provides drop data I needed to tweak the views API a bit. BUG=none TEST=none Review URL: http://codereview.chromium.org/173025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_test_base.cc3
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_tests.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index 4e842a2..981965d 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -9,7 +9,10 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/ui/ui_test.h"
+
+#if defined(TOOLKIT_VIEWS)
#include "views/view.h"
+#endif
AutomatedUITestBase::AutomatedUITestBase() {}
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc
index c29e2aa..a2b6611 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc
@@ -26,7 +26,10 @@
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/ui/ui_test.h"
#include "googleurl/src/gurl.h"
+
+#if defined(TOOLKIT_VIEWS)
#include "views/view.h"
+#endif
namespace {