Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5074)

Unified Diff: chrome/browser/ui/webui/version_ui.cc

Issue 1486403002: Mojo-ifying chrome://version. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing include Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 66af4c4340174c121152e86da91e4b1a9eb9b7aa..9f18f869d545441c7259ac526ed2f8670f4f7c7d 100644
--- a/chrome/browser/ui/webui/version_ui.cc
+++ b/chrome/browser/ui/webui/version_ui.cc
@@ -37,10 +37,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 {
@@ -153,21 +149,18 @@ 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);
+
return html_source;
}
} // namespace
-VersionUI::VersionUI(content::WebUI* web_ui)
- : content::WebUIController(web_ui) {
+VersionUI::VersionUI(content::WebUI* 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);
@@ -177,5 +170,9 @@ VersionUI::VersionUI(content::WebUI* web_ui)
WebUIDataSource::Add(profile, CreateVersionUIDataSource());
}
-VersionUI::~VersionUI() {
+VersionUI::~VersionUI() {}
+
+void VersionUI::BindUIHandler(
+ mojo::InterfaceRequest<mojom::VersionPageHandler> request) {
+ version_handler_.reset(new VersionHandler(web_ui(), std::move(request)));
}

Powered by Google App Engine
This is Rietveld 408576698