diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 00:41:56 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 00:41:56 +0000 |
| commit | cff19c16987bc2c418157a1dd23dd365625684f5 (patch) | |
| tree | 522e0a2488eb1e3b2985fc016e75cadfe52e1f78 /ui/aura | |
| parent | 4d91b01212f22563331a4d196a40e920aad49910 (diff) | |
| download | chromium_src-cff19c16987bc2c418157a1dd23dd365625684f5.zip chromium_src-cff19c16987bc2c418157a1dd23dd365625684f5.tar.gz chromium_src-cff19c16987bc2c418157a1dd23dd365625684f5.tar.bz2 | |
Use USE_X11 to test for X11 in aura_test_base
This is needed to allow Linux builds without X11.
Review URL: https://chromiumcodereview.appspot.com/12755005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index 81ed276..c507439 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -9,7 +9,7 @@ #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/ime/text_input_test_support.h" -#if defined(OS_LINUX) +#if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif @@ -73,7 +73,7 @@ void AuraTestBase::TearDown() { ui::TextInputTestSupport::Shutdown(); testing::Test::TearDown(); -#if defined(OS_LINUX) +#if defined(USE_X11) ui::ResetXCursorCache(); #endif } |