chrome/common/extensions/chrome_manifest_handlers.cc - Issue 26227005: Merge 225400 "Add "kiosk_only" manifest attribute for platform a..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/chrome_manifest_handlers.cc

Issue 26227005: Merge 225400 "Add "kiosk_only" manifest attribute for platform a..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1650/src/

Patch Set: Created 7 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

« no previous file with comments | « chrome/common/extensions/api/_manifest_features.json ('k') | chrome/common/extensions/docs/templates/articles/manifest/kiosk_enabled.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/chrome_manifest_handlers.cc

===================================================================

--- chrome/common/extensions/chrome_manifest_handlers.cc (revision 227631)

+++ chrome/common/extensions/chrome_manifest_handlers.cc (working copy)

@@ -32,7 +32,7 @@

#include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"

#include "chrome/common/extensions/manifest_handlers/externally_connectable.h"

#include "chrome/common/extensions/manifest_handlers/icons_handler.h"

-#include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h"

+#include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h"

#include "chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.h"

#include "chrome/common/extensions/manifest_handlers/nacl_modules_handler.h"

#include "chrome/common/extensions/manifest_handlers/offline_enabled_info.h"

@@ -70,7 +70,7 @@

#if defined(OS_CHROMEOS)

(new InputComponentsHandler)->Register();

#endif

- (new KioskEnabledHandler)->Register();

+ (new KioskModeHandler)->Register();

(new ManagedModeHandler)->Register();

(new MediaGalleriesHandlerParser)->Register();

(new MimeTypesHandlerParser)->Register();