Move app_shell specific impl from athena_lib to athena_shell_lib

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_activity_factory_creator.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extensions_delegate.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"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/system/public/system_ui.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 #include "athena/wm/public/window_manager.h"
@@ skipping 98 matching lines @@
   athena::ScreenManager::Create(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(),
+  StartAthenaSession(athena::CreateContentActivityFactory(),

[Jun Mukai, 2014/08/26 21:33:59]

Thinking about this: I would say ContentAppModelBuilder and
ContentActivityFactory are essentially browser-context-keyed-services, and they
should be created through BCKS factory framework (I don't like factory-factory
patterns though... :(

That sounds a big change, I'm not saying you have to do so. But would you mind
recording a TODO for this refactoring?  (or file a bug?) and assign to me.

[oshima, 2014/08/26 21:56:55]

Good point. We don't need it now, but will be necessary to support incognito
windows and multi-profile. I'll file a bug and work on it
separately.

                      new athena::ContentAppModelBuilder(context));
   athena::VirtualKeyboardManager::Create(context);
   athena::HomeCard::Get()->RegisterSearchProvider(
       new athena::UrlSearchProvider(context));
   AthenaEnvState* env_state =
       athena::ScreenManager::Get()->GetContext()->GetProperty(
           kAthenaEnvStateKey);
 
   env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
   CreateTestPages(context);
@@ skipping 16 matching lines @@
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
   athena::ExtensionsDelegate::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena