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

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

Issue 941973003: New OOBE implementation skeleton using WUG toolkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits. Created 5 years, 10 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/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 35a9b450c089b2ec2c7a987ce8a2fd7e52a55deb..b55c8ab3e7331d64c3bde173f07924d5e797e584 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -70,6 +70,7 @@
#include "content/public/common/content_client.h"
#include "content/public/common/url_utils.h"
#include "ui/gfx/favicon_size.h"
+#include "ui/oobe/oobe_ui.h"
#include "ui/web_dialogs/web_dialog_ui.h"
#include "url/gurl.h"
@@ -107,6 +108,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/oobe/oobe.h"
#include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"
#include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h"
#include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
@@ -206,6 +208,12 @@ template<>
WebUIController* NewWebUI<chromeos::OobeUI>(WebUI* web_ui, const GURL& url) {
return new chromeos::OobeUI(web_ui, url);
}
+
+template <>
+WebUIController* NewWebUI<OobeMdUI>(WebUI* web_ui, const GURL& url) {
+ Oobe::Register();
+ return new OobeMdUI(web_ui, url.host());
+}
#endif
// Special cases for DOM distiller.
@@ -428,6 +436,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<chromeos::NfcDebugUI>;
if (url.host() == chrome::kChromeUIOobeHost)
return &NewWebUI<chromeos::OobeUI>;
+ if (url.host() == chrome::kChromeUIOobeMdHost)
+ return &NewWebUI<OobeMdUI>;
if (url.host() == chrome::kChromeUIProvidedFileSystemsHost)
return &NewWebUI<chromeos::ProvidedFileSystemsUI>;
if (url.host() == chrome::kChromeUIProxySettingsHost)

Powered by Google App Engine
This is Rietveld 408576698