introduced athena_main_lib

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index fdfbfe9f0de27b0c497ad5f84de6d7b57ec2e593..693243584c7202825ba6ad2ffac516a8f27184fe 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -6,15 +6,28 @@
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.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"
 #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 "content/public/browser/browser_thread.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/aura/window_property.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"
 
@@ -23,22 +36,46 @@
 #endif
 
 namespace athena {
-struct RootWindowState;
+struct AthenaEnvState;
 }
 
-DECLARE_WINDOW_PROPERTY_TYPE(athena::RootWindowState*);
+DECLARE_WINDOW_PROPERTY_TYPE(athena::AthenaEnvState*);
 
 namespace athena {
 
-// Athena's per root window state.
-struct RootWindowState {
+class VirtualKeyboardObserver;
+
+// Athena's env state.
+struct AthenaEnvState {
   scoped_ptr< ::wm::VisibilityController> visibility_client;
+  scoped_ptr<VirtualKeyboardObserver> virtual_keyboard_observer;
 };
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(athena::RootWindowState,
-                                 kRootWindowStateKey,
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(athena::AthenaEnvState,
+                                 kAthenaEnvStateKey,
                                  NULL);
 
+// This class observes the change of the virtual keyboard and distribute the
+// change to appropriate modules of athena.
+// TODO(oshima): move the VK bounds logic to screen manager.

[Jun Mukai, 2014/08/19 17:22:35]

Note that VK depends on content layer (because VK is a webui), which makes
harder to add logic to screen manager.

[oshima, 2014/08/19 18:05:49]

What I meant is to move the observer interface to screen instead.
If this is only place that needs take an action, we may leave it as is.

+class VirtualKeyboardObserver : public keyboard::KeyboardControllerObserver {
+ public:
+  VirtualKeyboardObserver() {
+    keyboard::KeyboardController::GetInstance()->AddObserver(this);
+  }
+
+  virtual ~VirtualKeyboardObserver() {
+    keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
+  }
+
+ private:
+  virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE {
+    HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds);
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver);
+};
+
 class AthenaViewsDelegate : public views::ViewsDelegate {
  public:
   AthenaViewsDelegate() {}
@@ -54,21 +91,26 @@ class AthenaViewsDelegate : public views::ViewsDelegate {
   DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
 };
 
-void StartAthena(aura::Window* root_window,
-                 athena::ActivityFactory* activity_factory,
-                 athena::AppModelBuilder* app_model_builder) {
+void StartAthenaEnv(aura::Window* root_window) {
+  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();
 
-  RootWindowState* root_window_state = new RootWindowState;
-  root_window->SetProperty(kRootWindowStateKey, root_window_state);
+  AthenaEnvState* env_state = new AthenaEnvState;
+
+  // Setup VisibilityClient
+  env_state->visibility_client.reset(new ::wm::VisibilityController);
 
-  root_window_state->visibility_client.reset(new ::wm::VisibilityController);
   aura::client::SetVisibilityClient(root_window,
-                                    root_window_state->visibility_client.get());
+                                    env_state->visibility_client.get());
 
   athena::SystemUI::Create(
       content::BrowserThread::GetMessageLoopProxyForThread(
@@ -76,10 +118,32 @@ void StartAthena(aura::Window* root_window,
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(root_window);
   athena::WindowManager::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);
+  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);
+  CreateDebugWindow();
+}
+
+void StartAthenaSession(athena::ActivityFactory* activity_factory,

[Jun Mukai, 2014/08/19 17:22:35]

Do we need to keep this?
athena_unittests now depends on content layer, so initialization with
TestBrowserContext would be acceptable.

[oshima, 2014/08/19 18:05:49]

That's not enough because test doesn't initialize shell extension.
We'll remove it, but not ready yet.

+                        athena::AppModelBuilder* app_model_builder) {
   athena::HomeCard::Create(app_model_builder);
   athena::ActivityManager::Create();
   athena::ActivityFactory::RegisterActivityFactory(activity_factory);
-  SetupBackgroundImage();
 }
 
 void ShutdownAthena() {