athena: Use mojo to provide the bindings for the virtual keyboard.

athena/virtual_keyboard/virtual_keyboard_manager_impl.cc

Index: athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
diff --git a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
index d6bea69adc1b564a8c4a9e2ed1387385eee2b80d..f1893ad2d8ba1e2552b6e799831add614e54cafc 100644
--- a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -6,9 +6,9 @@
 
 #include "athena/common/fill_layout_manager.h"
 #include "athena/screen/public/screen_manager.h"
-#include "athena/virtual_keyboard/vk_webui_controller.h"
 #include "base/bind.h"
 #include "base/memory/singleton.h"
+#include "base/path_service.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
 #include "ui/aura/client/aura_constants.h"
@@ -19,6 +19,7 @@
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_proxy.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/webui/vk_webui_controller.h"
 
 namespace athena {
 
@@ -50,6 +51,8 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
     return browser_context_;
   }
 
+  virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE {}
+
  private:
   content::BrowserContext* browser_context_;
   aura::Window* root_window_;
@@ -79,7 +82,6 @@ class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
     container_ = athena::ScreenManager::Get()->CreateContainer(
         "VirtualKeyboardContainer");
     container_->SetLayoutManager(new FillLayoutManager(container_));
-    keyboard::SetOverrideContentUrl(GURL(keyboard::kKeyboardURL));
 
     keyboard_controller_.reset(new keyboard::KeyboardController(
         new BasicKeyboardControllerProxy(browser_context_,
@@ -88,9 +90,6 @@ class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
     aura::Window* kb_container = keyboard_controller_->GetContainerWindow();
     container_->AddChild(kb_container);
     kb_container->Show();
-
-    content::WebUIControllerFactory::RegisterFactory(
-        VKWebUIControllerFactory::GetInstance());
   }
 
   content::BrowserContext* browser_context_;
@@ -107,6 +106,8 @@ VirtualKeyboardManager* VirtualKeyboardManager::Create(
     content::BrowserContext* browser_context) {
   CHECK(!instance);
   keyboard::InitializeKeyboard();
+  keyboard::InitializeWebUIBindings();
+
   new VirtualKeyboardManagerImpl(browser_context);
   CHECK(instance);
   return instance;