Introduces ActivityFactory for SampleActivity.

athena/main/athena_launcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/main/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/home/public/home_card.h"
 #include "athena/main/placeholder.h"
@@ skipping 17 matching lines @@
 
 // Athena's per root window state.
 struct RootWindowState {
   scoped_ptr< ::wm::VisibilityController> visibility_client;
 };
 
 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
   RootWindowState* root_window_state = new RootWindowState;
   root_window->SetProperty(kRootWindowStateKey, root_window_state);
 
   root_window_state->visibility_client.reset(new ::wm::VisibilityController);
   aura::client::SetVisibilityClient(root_window,
                                     root_window_state->visibility_client.get());
 
   athena::ScreenManager::Create(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();
   athena::ScreenManager::Shutdown();
 }
 
 }  // namespace athena