diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-11 05:04:23 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-11 05:04:23 +0000 |
| commit | eb137e547bc36459c6ff3b3c7d595299db074c7f (patch) | |
| tree | e1386698b06e7fcbd233fc19bfd4f0f796c6d9ef /athena/test | |
| parent | 60daee815b1dccaa10bf013da4d0d78ddb7c0f98 (diff) | |
| download | chromium_src-eb137e547bc36459c6ff3b3c7d595299db074c7f.zip chromium_src-eb137e547bc36459c6ff3b3c7d595299db074c7f.tar.gz chromium_src-eb137e547bc36459c6ff3b3c7d595299db074c7f.tar.bz2 | |
Athena's FocusManager
This is necessary to handle non reserved accelerator.
Plus a couple of improvements
* move deps for tests to athena/DEPS
* add capture/activation controllers.
* don't set override redirect for athena_shell.
BUG=375534
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/322503005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/athena_test_base.cc | 7 | ||||
| -rw-r--r-- | athena/test/athena_test_helper.cc | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/athena/test/athena_test_base.cc b/athena/test/athena_test_base.cc index d1f6260..a8ee6d3 100644 --- a/athena/test/athena_test_base.cc +++ b/athena/test/athena_test_base.cc @@ -7,6 +7,10 @@ #include "athena/test/athena_test_helper.h" #include "ui/compositor/test/context_factories_for_test.h" +#if defined(USE_X11) +#include "ui/aura/window_tree_host_x11.h" +#endif + namespace athena { namespace test { @@ -31,6 +35,9 @@ void AthenaTestBase::SetUp() { ui::InitializeContextFactoryForTests(enable_pixel_output); helper_.reset(new AthenaTestHelper(&message_loop_)); +#if defined(USE_X11) + aura::test::SetUseOverrideRedirectWindowByDefault(true); +#endif helper_->SetUp(context_factory); } diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc index 88961ba..a8e06c5 100644 --- a/athena/test/athena_test_helper.cc +++ b/athena/test/athena_test_helper.cc @@ -22,7 +22,6 @@ #include "ui/wm/core/input_method_event_filter.h" #if defined(USE_X11) -#include "ui/aura/window_tree_host_x11.h" #include "ui/base/x/x11_util.h" #endif @@ -36,9 +35,6 @@ AthenaTestHelper::AthenaTestHelper(base::MessageLoopForUI* message_loop) // Disable animations during tests. zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); -#if defined(USE_X11) - aura::test::SetUseOverrideRedirectWindowByDefault(true); -#endif } AthenaTestHelper::~AthenaTestHelper() { |