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

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

Issue 1181703008: Removed webui_generator and new OOBE UI placeholder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed empty line. Created 5 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/oobe/oobe.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2b2a5e3fa56ec33d0ca1bd2c9cb337e5c2bdf997..f6d062fdd1cf2b249d880faeb4cc74caf0d2b7cf 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -69,7 +69,6 @@
#include "content/public/common/content_client.h"
#include "content/public/common/url_utils.h"
#include "ui/gfx/favicon_size.h"
-#include "ui/oobe/oobe_md_ui.h"
#include "ui/web_dialogs/web_dialog_ui.h"
#include "url/gurl.h"
@@ -115,7 +114,6 @@
#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"
@@ -218,12 +216,6 @@ 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) {
- chromeos::Oobe::Register();
- return new OobeMdUI(web_ui, url.host());
-}
#endif
#if !defined(OS_ANDROID) && !defined(OS_IOS)
@@ -461,8 +453,6 @@ 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::kChromeUIPowerHost)
return &NewWebUI<chromeos::PowerUI>;
if (url.host() == chrome::kChromeUIProvidedFileSystemsHost)
« no previous file with comments | « chrome/browser/chromeos/oobe/oobe.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698