Multi-Profiles: New Profile Setup UI

chrome/browser/ui/webui/chrome_web_ui_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
index 2e2ecd1ff1a2e7fe3082676bda417eda4664dfc1..f7e11625a852c94b1ee3810ab9827ef3b884a226 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/browser/ui/webui/media_internals_ui.h"
 #include "chrome/browser/ui/webui/net_internals_ui.h"
+#include "chrome/browser/ui/webui/new_profile_ui.h"

[James Hawkins, 2011/06/30 23:02:58]

If this is only used for OS_CHROMEOS, move this include to an ifdef block.

[sail, 2011/07/01 01:16:18]

Done.

 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/plugins_ui.h"
@@ -222,6 +223,13 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
   if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)
     return &NewWebUI<ConstrainedHtmlUI>;
 
+#if !defined(OS_CHROMEOS)
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)) {
+    if (url.host() == chrome::kChromeUINewProfileHost)
+      return &NewWebUI<NewProfileUI>;
+  }
+#endif
+
   return NULL;
 }