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

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

Issue 2401853005: Adding client code for new Windows 10 First Run Experience (Closed)
Patch Set: Using Polymer dom-bind Created 4 years, 2 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 6b8cfb5baf08fa958c8817c738322001078d4b6d..70c5c952f4e5dc061df1359a73672441fe010f86 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -171,6 +171,7 @@
#if defined(OS_WIN)
#include "chrome/browser/ui/webui/conflicts_ui.h"
#include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
+#include "chrome/browser/ui/webui/welcome_win10_ui.h"
#endif
#if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
@@ -277,6 +278,13 @@ WebUIController* NewWebUI<WelcomeUI>(WebUI* web_ui, const GURL& url) {
#endif // !defined(OS_CHROMEOS)
#endif // !defined(OS_ANDROID)
+#if defined(OS_WIN)
+template <>
+WebUIController* NewWebUI<WelcomeWin10UI>(WebUI* web_ui, const GURL& url) {
+ return new WelcomeWin10UI(web_ui, url);
+}
+#endif // defined(OS_WIN)
+
#if defined(ENABLE_EXTENSIONS)
// Only create ExtensionWebUI for URLs that are allowed extension bindings,
// hosted by actual tabs.
@@ -562,10 +570,14 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
if (url.host() == chrome::kChromeUIWelcomeHost)
return &NewWebUI<WelcomeUI>;
#endif
+#if defined(OS_WIN)
+ if (url.host() == chrome::kChromeUIWelcomeWin10Host)
+ return &NewWebUI<WelcomeWin10UI>;
+#endif // defined(OS_WIN)
- /****************************************************************************
- * Other #defines and special logics.
- ***************************************************************************/
+/****************************************************************************
michaelpg 2016/10/22 03:19:00 existing spacing was correct (preprocessor direct
Patrick Monette 2016/10/24 20:49:39 Fixed.
+ * Other #defines and special logics.
+ ***************************************************************************/
#if !defined(DISABLE_NACL)
if (url.host() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;

Powered by Google App Engine
This is Rietveld 408576698