Separate athena's startup process from AppShell's

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/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"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/aura/window_property.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/native_theme/native_theme_switches.h"
 #include "ui/views/views_delegate.h"
 #include "ui/wm/core/visibility_controller.h"
 
 #if defined(USE_X11)
 #include "ui/events/x/touch_factory_x11.h"
 #endif
 
@@ skipping 46 matching lines @@
  private:
   // views::ViewsDelegate:
   virtual void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
 };
 
-void StartAthenaEnv(aura::Window* root_window,
-                    athena::ScreenManagerDelegate* delegate,
-                    scoped_refptr<base::TaskRunner> file_runner) {
+void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
+  athena::AthenaEnv::Create();
+
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   // Force showing in the experimental app-list view.
   command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
   command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 
 #if defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 
   views::ViewsDelegate::views_delegate = new AthenaViewsDelegate();
 
   AthenaEnvState* env_state = new AthenaEnvState;
 
   // Setup VisibilityClient
   env_state->visibility_client.reset(new ::wm::VisibilityController);
+  aura::Window* root_window = athena::AthenaEnv::Get()->GetHost()->window();
 
   aura::client::SetVisibilityClient(root_window,
                                     env_state->visibility_client.get());
 
   athena::SystemUI::Create(file_runner);
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
-  athena::ScreenManager::Create(delegate, root_window);
+  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) {
   athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context);
@@ skipping 21 matching lines @@
 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();
   athena::ExtensionsDelegate::Shutdown();
+  athena::AthenaEnv::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena