Revert 291221 "Athena: Adding basic resource management framewor..."

trunk/src/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/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/home/public/home_card.h"
 #include "athena/home/public/home_card.h"
 #include "athena/input/public/input_manager.h"
 #include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
 #include "athena/screen/public/screen_manager.h"
@@ skipping 93 matching lines @@
 
   aura::client::SetVisibilityClient(root_window,
                                     env_state->visibility_client.get());
 
   athena::SystemUI::Create(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::FILE));
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(delegate, root_window);
   athena::WindowManager::Create();
-  athena::AppRegistry::Create();
   SetupBackgroundImage();
 
   athena::ScreenManager::Get()->GetContext()->SetProperty(
       kAthenaEnvStateKey, env_state);
 }
 
 void StartAthenaSessionWithContext(content::BrowserContext* context) {
   StartAthenaSession(new athena::ContentActivityFactory(),
                      new athena::ContentAppModelBuilder(context));
   athena::VirtualKeyboardManager::Create(context);
@@ skipping 12 matching lines @@
                         athena::AppModelBuilder* app_model_builder) {
   athena::HomeCard::Create(app_model_builder);
   athena::ActivityManager::Create();
   athena::ActivityFactory::RegisterActivityFactory(activity_factory);
 }
 
 void ShutdownAthena() {
   athena::ActivityFactory::Shutdown();
   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
-  athena::AppRegistry::ShutDown();
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena