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

Unified Diff: extensions/common/common_manifest_handlers.cc

Issue 1301323005: Implement kiosk multiple apps feature. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits. Created 5 years, 4 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: extensions/common/common_manifest_handlers.cc
diff --git a/extensions/common/common_manifest_handlers.cc b/extensions/common/common_manifest_handlers.cc
index 95293215947b248282790b67c3595f6dc9db91c9..c11accbae7b3479ed2f0a162d255e000247804a6 100644
--- a/extensions/common/common_manifest_handlers.cc
+++ b/extensions/common/common_manifest_handlers.cc
@@ -18,6 +18,7 @@
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "extensions/common/manifest_handlers/incognito_info.h"
#include "extensions/common/manifest_handlers/kiosk_mode_info.h"
+#include "extensions/common/manifest_handlers/kiosk_secondary_apps_info.h"
#include "extensions/common/manifest_handlers/launcher_page_info.h"
#include "extensions/common/manifest_handlers/mime_types_handler.h"
#include "extensions/common/manifest_handlers/nacl_modules_handler.h"
@@ -44,6 +45,7 @@ void RegisterCommonManifestHandlers() {
(new IconsHandler)->Register();
(new IncognitoHandler)->Register();
(new KioskModeHandler)->Register();
+ (new KioskSecondaryAppsHandler)->Register();
(new LauncherPageHandler)->Register();
(new MimeTypesHandlerParser)->Register();
#if !defined(DISABLE_NACL)

Powered by Google App Engine
This is Rietveld 408576698