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

Unified Diff: chrome/browser/ui/webui/extensions/extensions_ui.cc

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and remove temp flag Created 7 years, 7 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/extensions/extensions_ui.cc
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
index a06a7c6cf2b42eaae11cf6d3c9914ae711d4ba91..7d1b9ded1c485fa6a938ea9371a0deb7ce2a7efe 100644
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -14,6 +14,10 @@
#include "content/public/browser/web_ui_data_source.h"
#include "grit/browser_resources.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h"
+#endif
+
namespace {
content::WebUIDataSource* CreateExtensionsHTMLSource() {
@@ -55,6 +59,13 @@ ExtensionsUI::ExtensionsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
install_extension_handler->GetLocalizedValues(source);
web_ui->AddMessageHandler(install_extension_handler);
+#if defined(OS_CHROMEOS)
+ chromeos::KioskAppsHandler* kiosk_app_handler =
+ new chromeos::KioskAppsHandler();
+ kiosk_app_handler->GetLocalizedValues(source);
+ web_ui->AddMessageHandler(kiosk_app_handler);
+#endif
+
content::WebUIDataSource::Add(profile, source);
}

Powered by Google App Engine
This is Rietveld 408576698