Mojo-ifying chrome://version.

chrome/browser/ui/webui/version_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/version_ui.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/version_handler.h"
@@ skipping 18 matching lines @@
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #include "chrome/browser/ui/android/android_about_app_info.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/webui/version_handler_chromeos.h"
-#endif
-
 using content::WebUIDataSource;
 
 namespace {
 
 WebUIDataSource* CreateVersionUIDataSource() {
   WebUIDataSource* html_source =
       WebUIDataSource::Create(chrome::kChromeUIVersionHost);
 
   // Localized and data strings.
   html_source->AddLocalizedString(version_ui::kTitle, IDS_VERSION_UI_TITLE);
@@ skipping 88 matching lines @@
 #else
   html_source->AddString("compiler", "MSVC");
 #endif
 #endif
 
   html_source->SetJsonPath("strings.js");
   html_source->AddResourcePath(version_ui::kVersionJS, IDR_VERSION_UI_JS);
   html_source->AddResourcePath(version_ui::kAboutVersionCSS,
                                IDR_VERSION_UI_CSS);
   html_source->SetDefaultResource(IDR_VERSION_UI_HTML);
+
+  html_source->AddResourcePath(
+      "chrome/browser/ui/webui/version.mojom",
+      IDR_VERSION_MOJO_JS);

[Dan Beam, 2015/12/09 21:45:07]

html_source->AddResourcePath("chrome/browser/ui/webui/version.mojom",
                             IDR_VERSION_MOJO_JS);

is less lines and matches L144

[dpapad, 2015/12/10 01:08:27]

Done.

+  html_source->AddMojoResources();
+
   return html_source;
 }
 
 }  // namespace
 
 VersionUI::VersionUI(content::WebUI* web_ui)
-    : content::WebUIController(web_ui) {
+    :  MojoWebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
 
-#if defined(OS_CHROMEOS)
-  web_ui->AddMessageHandler(new VersionHandlerChromeOS());
-#else
-  web_ui->AddMessageHandler(new VersionHandler());
-#endif
-
 #if defined(ENABLE_THEMES)
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   WebUIDataSource::Add(profile, CreateVersionUIDataSource());
 }
 
 VersionUI::~VersionUI() {
 }
+
+void VersionUI::BindUIHandler(
+    mojo::InterfaceRequest<VersionHandlerMojo> request) {
+  // VersionHandler deletes itself when the pipe is closed.
+  new VersionHandler(web_ui(), request.Pass());
+}