| Index: chrome/browser/ui/webui/version_ui.cc
|
| diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc
|
| index 4fc5a9cc2b4534e37981781ea808207b104e5098..2d7db6bf5b644a98a2751881502a8058754b6bd8 100644
|
| --- a/chrome/browser/ui/webui/version_ui.cc
|
| +++ b/chrome/browser/ui/webui/version_ui.cc
|
| @@ -36,10 +36,6 @@
|
| #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 {
|
| @@ -148,21 +144,21 @@ WebUIDataSource* CreateVersionUIDataSource() {
|
| 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);
|
| + 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);
|
| @@ -174,3 +170,9 @@ VersionUI::VersionUI(content::WebUI* web_ui)
|
|
|
| VersionUI::~VersionUI() {
|
| }
|
| +
|
| +void VersionUI::BindUIHandler(
|
| + mojo::InterfaceRequest<VersionHandlerMojo> request) {
|
| + // VersionHandler deletes itself when the pipe is closed.
|
| + new VersionHandler(web_ui(), request.Pass());
|
| +}
|
|
|