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

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: remove grabber.js 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
« no previous file with comments | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | chrome/chrome_browser.gypi » ('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 38805f7687d42fc20917bfa411cc2f043b35ad67..43647a8a33eefa4483f780b3a88e0b730413874a 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -75,6 +75,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
@@ -243,6 +247,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>;
« no previous file with comments | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698