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 69d91871da21c5ca137e0d1f100e6c0366b9ec4f..1de68ee1cb2f0c5e8b70d4bccb1c17ab21cc2a93 100644
--- a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -7,7 +7,6 @@
 #include "athena/common/container_priorities.h"
 #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/values.h"
@@ -51,6 +50,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_;
@@ -81,7 +82,6 @@ class VirtualKeyboardManagerImpl : public VirtualKeyboardManager {
                                                   CP_VIRTUAL_KEYBOARD);
     container_ = athena::ScreenManager::Get()->CreateContainer(params);
     container_->SetLayoutManager(new FillLayoutManager(container_));
-    keyboard::SetOverrideContentUrl(GURL(keyboard::kKeyboardURL));
 
     keyboard_controller_.reset(new keyboard::KeyboardController(
         new BasicKeyboardControllerProxy(browser_context_,
@@ -90,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_;
@@ -110,6 +107,8 @@ VirtualKeyboardManager* VirtualKeyboardManager::Create(
   CHECK(!instance);
   keyboard::InitializeKeyboard();
   keyboard::SetTouchKeyboardEnabled(true);
+  keyboard::InitializeWebUIBindings();
+
   new VirtualKeyboardManagerImpl(browser_context);
   CHECK(instance);
   return instance;