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

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

Issue 8423055: [Aura] Initial app list webui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and address comments in patch 7 Created 9 years, 1 month 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_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 b48312ae57b96d7a01c8ca6d05ade3e4ce565a8a..5fc76564a9880e59e987442e749d8e0565a70a68 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -76,6 +76,10 @@
#include "chrome/browser/ui/webui/certificate_viewer_ui.h"
#endif
+#if defined(USE_AURA)
+#include "chrome/browser/ui/webui/aura/app_list_ui.h"
+#endif
+
namespace {
// A function for creating a new WebUI. The caller owns the return value, which
@@ -246,6 +250,11 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
}
#endif
+#if defined(USE_AURA)
+ if (url.host() == chrome::kChromeUIAppListHost)
+ return &NewWebUI<AppListUI>;
+#endif
+
if (url.host() == chrome::kChromeUIPrintHost &&
switches::IsPrintPreviewEnabled()) {
return &NewWebUI<PrintPreviewUI>;

Powered by Google App Engine
This is Rietveld 408576698