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

ui/keyboard/webui/vk_webui_controller.cc

Index: ui/keyboard/webui/vk_webui_controller.cc
diff --git a/athena/virtual_keyboard/vk_webui_controller.cc b/ui/keyboard/webui/vk_webui_controller.cc
similarity index 63%
rename from athena/virtual_keyboard/vk_webui_controller.cc
rename to ui/keyboard/webui/vk_webui_controller.cc
index d26b2c94d3eaef7c854fb6cb9c82cad64f54c5f4..cfe63b1f14b2b3ac4a5ec0c880fe7cb12c1b04b6 100644
--- a/athena/virtual_keyboard/vk_webui_controller.cc
+++ b/ui/keyboard/webui/vk_webui_controller.cc
@@ -2,35 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/virtual_keyboard/vk_webui_controller.h"
+#include "ui/keyboard/webui/vk_webui_controller.h"
 
-#include "athena/virtual_keyboard/vk_message_handler.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "content/public/common/service_registry.h"
 #include "grit/keyboard_resources.h"
 #include "grit/keyboard_resources_map.h"
+#include "mojo/public/cpp/system/core.h"
 #include "ui/keyboard/keyboard_constants.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/keyboard/webui/vk_mojo_handler.h"
 
-namespace athena {
+namespace keyboard {
 
 namespace {
 
 content::WebUIDataSource* CreateKeyboardUIDataSource() {
   content::WebUIDataSource* source =
-      content::WebUIDataSource::Create(keyboard::kKeyboardHost);
+      content::WebUIDataSource::Create(kKeyboardHost);
 
   size_t count = 0;
-  const GritResourceMap* resources =
-      keyboard::GetKeyboardExtensionResources(&count);
+  const GritResourceMap* resources = GetKeyboardExtensionResources(&count);
   source->SetDefaultResource(IDR_KEYBOARD_INDEX);
 
-  const std::string keyboard_host =
-      base::StringPrintf("%s/", keyboard::kKeyboardHost);
+  const std::string keyboard_host = base::StringPrintf("%s/", kKeyboardHost);
   for (size_t i = 0; i < count; ++i) {
     size_t offset = 0;
+    // The webui URL needs to skip the 'keyboard/' at the front of the resource
+    // names, since it is part of the data-source name.
     if (StartsWithASCII(std::string(resources[i].name), keyboard_host, false))
       offset = keyboard_host.length();
     source->AddResourcePath(resources[i].name + offset, resources[i].value);
@@ -44,23 +48,39 @@ content::WebUIDataSource* CreateKeyboardUIDataSource() {
 // VKWebUIController:
 
 VKWebUIController::VKWebUIController(content::WebUI* web_ui)
-    : WebUIController(web_ui) {
+    : WebUIController(web_ui),
+      weak_factory_(this) {
   content::BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
-  web_ui->AddMessageHandler(new VKMessageHandler());
   content::WebUIDataSource::Add(browser_context, CreateKeyboardUIDataSource());
+  content::WebUIDataSource::AddMojoDataSource(browser_context)
+      ->AddResourcePath("ui/keyboard/webui/keyboard.mojom",
+                        IDR_KEYBOARD_MOJO_GEN_JS);
 }
 
 VKWebUIController::~VKWebUIController() {
 }
 
+void VKWebUIController::RenderViewCreated(content::RenderViewHost* host) {
+  host->GetMainFrame()->GetServiceRegistry()->AddService(

[Sam McNally, 2014/06/26 11:04:40]

You'll want to use AddService<KeyboardUIHandlerMojo> to avoid needing to
manually include the service name.

[sadrul, 2014/08/01 22:41:47]

Done.

+      "webui_controller",
+      base::Bind(&VKWebUIController::CreateAndStoreUIHandler,
+                 weak_factory_.GetWeakPtr()));
+}
+
+void VKWebUIController::CreateAndStoreUIHandler(
+    mojo::ScopedMessagePipeHandle handle_to_api) {

[Sam McNally, 2014/06/26 11:04:40]

With the above change, this can turn into
mojo::InterfaceRequest<KeyboardUIHandlerMojo> and BindToPipe below can turn into
BindToRequest.

[sadrul, 2014/08/01 22:41:47]

Done.

+  ui_handler_ = scoped_ptr<VKMojoHandler>(
+      mojo::BindToPipe(new VKMojoHandler(), handle_to_api.Pass()));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // VKWebUIControllerFactory:
 
 content::WebUI::TypeID VKWebUIControllerFactory::GetWebUIType(
     content::BrowserContext* browser_context,
     const GURL& url) const {
-  if (url == GURL(keyboard::kKeyboardURL))
+  if (url == GURL(kKeyboardURL))
     return const_cast<VKWebUIControllerFactory*>(this);
 
   return content::WebUI::kNoWebUI;
@@ -81,7 +101,7 @@ bool VKWebUIControllerFactory::UseWebUIBindingsForURL(
 content::WebUIController* VKWebUIControllerFactory::CreateWebUIControllerForURL(
     content::WebUI* web_ui,
     const GURL& url) const {
-  if (url == GURL(keyboard::kKeyboardURL))
+  if (url == GURL(kKeyboardURL))
     return new VKWebUIController(web_ui);
   return NULL;
 }
@@ -98,4 +118,4 @@ VKWebUIControllerFactory::VKWebUIControllerFactory() {
 VKWebUIControllerFactory::~VKWebUIControllerFactory() {
 }
 
-}  // namespace athena
+}  // namespace keyboard