Introduces ActivityFactory for SampleActivity.

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 7e88e78994bb2e872a6b2f2caab91f064b2a3828..89e845210a4c3e2e816efa0e06d3426c0e493622 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -35,7 +35,8 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(athena::RootWindowState,
                                  kRootWindowStateKey,
                                  NULL);
 
-void StartAthena(aura::Window* root_window) {
+void StartAthena(aura::Window* root_window,
+                 athena::ActivityFactory* activity_factory) {
 #if defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
@@ -50,10 +51,12 @@ void StartAthena(aura::Window* root_window) {
   athena::WindowManager::Create();
   athena::HomeCard::Create();
   athena::ActivityManager::Create();
+  athena::ActivityFactory::RegisterActivityFactory(activity_factory);
   SetupBackgroundImage();
 }
 
 void ShutdownAthena() {
+  athena::ActivityFactory::Shutdown();
   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
   athena::WindowManager::Shutdown();