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

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

Issue 2252063002: Adding client code for new desktop First Run Experience. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing build issues after rebasing Created 4 years, 3 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 defe70ee0437eeee66514e663937817da009e6c0..d79cf4842035d466961432cbd3d56fb68b1cc516 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -57,7 +57,6 @@
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
-#include "chrome/browser/ui/webui/version_ui.h"
michaelpg 2016/09/06 22:21:56 wat
tmartino 2016/09/07 23:06:42 Whoops, good catch. Originally had my include as t
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -158,6 +157,8 @@
#include "chrome/browser/ui/webui/signin/inline_login_ui.h"
#include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
#include "chrome/browser/ui/webui/signin/user_manager_ui.h"
+#include "chrome/browser/ui/webui/version_ui.h"
+#include "chrome/browser/ui/webui/welcome_ui.h"
#endif
#if defined(OS_WIN)
@@ -260,7 +261,14 @@ WebUIController* NewWebUI<settings::MdSettingsUI>(WebUI* web_ui,
const GURL& url) {
return new settings::MdSettingsUI(web_ui, url);
}
-#endif
+
+#if !defined(OS_CHROMEOS)
+template <>
+WebUIController* NewWebUI<WelcomeUI>(WebUI* web_ui, const GURL& url) {
+ return new WelcomeUI(web_ui, url);
+}
+#endif // !defined(OS_CHROMEOS)
+#endif // !defined(OS_ANDROID)
#if defined(ENABLE_EXTENSIONS)
// Only create ExtensionWebUI for URLs that are allowed extension bindings,
@@ -534,6 +542,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<SyncConfirmationUI>;
if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
return &NewWebUI<ProfileSigninConfirmationUI>;
+ if (url.host() == chrome::kChromeUIWelcomeHost)
+ return &NewWebUI<WelcomeUI>;
#endif
/****************************************************************************

Powered by Google App Engine
This is Rietveld 408576698