| Index: athena/main/athena_launcher.cc
|
| diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
|
| index 89e845210a4c3e2e816efa0e06d3426c0e493622..941904b92222dc4ec29eed7e356544be949d4f65 100644
|
| --- a/athena/main/athena_launcher.cc
|
| +++ b/athena/main/athena_launcher.cc
|
| @@ -36,7 +36,8 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(athena::RootWindowState,
|
| NULL);
|
|
|
| void StartAthena(aura::Window* root_window,
|
| - athena::ActivityFactory* activity_factory) {
|
| + athena::ActivityFactory* activity_factory,
|
| + athena::AppModelBuilder* app_model_builder) {
|
| #if defined(USE_X11)
|
| ui::TouchFactory::SetTouchDeviceListFromCommandLine();
|
| #endif
|
| @@ -49,7 +50,7 @@ void StartAthena(aura::Window* root_window,
|
|
|
| athena::ScreenManager::Create(root_window);
|
| athena::WindowManager::Create();
|
| - athena::HomeCard::Create();
|
| + athena::HomeCard::Create(app_model_builder);
|
| athena::ActivityManager::Create();
|
| athena::ActivityFactory::RegisterActivityFactory(activity_factory);
|
| SetupBackgroundImage();
|
|
|