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

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

Issue 619263002: Remove chrome://welcome page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename the test again Created 6 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 c8dbb78fadef9ade134fbbf089a523ccca783ca3..6a8f3a48455af568b7d9b9c0adc9fa5da7f8a328 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -88,9 +88,7 @@
#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
#endif
-#if defined(OS_ANDROID)
-#include "chrome/browser/ui/webui/welcome_ui_android.h"
-#else
+#if !defined(OS_ANDROID)
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
#include "chrome/browser/ui/webui/suggestions_internals/suggestions_internals_ui.h"
@@ -346,10 +344,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
/****************************************************************************
* OS Specific #defines
***************************************************************************/
-#if defined(OS_ANDROID)
- if (url.host() == chrome::kChromeUIWelcomeHost)
- return &NewWebUI<WelcomeUI>;
-#else
+#if !defined(OS_ANDROID)
// AppLauncherPage is not needed on Android.
if (url.host() == chrome::kChromeUIAppLauncherPageHost &&
profile && extensions::ExtensionSystem::Get(profile)->

Powered by Google App Engine
This is Rietveld 408576698