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

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

Issue 7256002: Multi-Profiles: New Profile Setup UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 9 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/resources/new_profile.js ('k') | chrome/browser/ui/webui/new_profile_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_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..c6654d3b3efb299b57a691a7a272103ffe63b9bd 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -55,6 +55,8 @@
#include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
#include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
#include "chrome/browser/ui/webui/active_downloads_ui.h"
+#else
+#include "chrome/browser/ui/webui/new_profile_ui.h"
#endif
#if defined(TOUCH_UI)
@@ -222,6 +224,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;
}
« no previous file with comments | « chrome/browser/resources/new_profile.js ('k') | chrome/browser/ui/webui/new_profile_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698