Athena: Adding basic resource management framework (un-/re-loading) of V2 applications

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/home/public/home_card.h"
 #include "athena/input/public/input_manager.h"
 #include "athena/main/placeholder.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/system/public/system_ui.h"
 #include "athena/wm/public/window_manager.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/aura/window_property.h"
 #include "ui/views/views_delegate.h"
@@ skipping 49 matching lines @@
 
   root_window_state->visibility_client.reset(new ::wm::VisibilityController);
   aura::client::SetVisibilityClient(root_window,
                                     root_window_state->visibility_client.get());
 
   athena::SystemUI::Create(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::FILE));
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(root_window);
+  athena::AppRegistry::Create();

[oshima, 2014/08/19 21:22:25]

Can you move this after HomeCard::Create ? activity related service should start
after desktop modules are initialized. 

[Mr4D (OOO till 08-26), 2014/08/20 14:34:40]

It has no side effects, requires no other module to be present and the only
thing which is required is that
a. it is present when the first V2 app gets started and
b. until all V2 apps are gone.
I suppose that the window manager is ok (done that) but for the homecard I am
sure we do not want to pass that - especially when you look at the updated code.
Partially done.

[oshima, 2014/08/20 19:51:49]

that's fine with me. btw, there is a change to this method, so you need to sync.

[Mr4D (OOO till 08-26), 2014/08/20 22:34:22]

As stated in my comment - I have already resolved the resulting conflicts (see
changed result).

   athena::WindowManager::Create();
   athena::HomeCard::Create(app_model_builder);
   athena::ActivityManager::Create();
   athena::ActivityFactory::RegisterActivityFactory(activity_factory);
   SetupBackgroundImage();
 }
 
 void ShutdownAthena() {
   athena::ActivityFactory::Shutdown();
   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
   athena::WindowManager::Shutdown();
+  athena::AppRegistry::ShutDown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena