| Index: athena/test/athena_test_helper.cc
|
| diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc
|
| index 8f5df979289ce628536b0755f912bdbe85648a2d..31431b71ebb5b4576952ced46685eb736e689b9e 100644
|
| --- a/athena/test/athena_test_helper.cc
|
| +++ b/athena/test/athena_test_helper.cc
|
| @@ -8,6 +8,7 @@
|
| #include "athena/screen/public/screen_manager.h"
|
| #include "athena/test/sample_activity_factory.h"
|
| #include "athena/test/test_app_model_builder.h"
|
| +#include "athena/test/test_screen_manager_delegate.h"
|
| #include "base/command_line.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| @@ -70,6 +71,8 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
|
| test_screen_.reset(aura::TestScreen::Create(host_size));
|
| gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
|
| host_.reset(test_screen_->CreateHostForPrimaryDisplay());
|
| + screen_manager_delegate_.reset(
|
| + new TestScreenManagerDelegate(test_screen_.get()));
|
|
|
| input_method_filter_.reset(new ::wm::InputMethodEventFilter(
|
| root_window()->GetHost()->GetAcceleratedWidget()));
|
| @@ -88,6 +91,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {
|
| host()->SetBounds(gfx::Rect(host_size));
|
|
|
| athena::StartAthena(root_window(),
|
| + screen_manager_delegate_.get(),
|
| new SampleActivityFactory(),
|
| new TestAppModelBuilder());
|
| }
|
|
|