chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

index 2d6fe81df75449944409a04239d3f09f5454c1ac..e54d2543252312f216439c0a7e1bcad9d4f0b774 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

@@ -96,7 +96,7 @@ void ScreensaverUnpackerClient::LoadScreensaverExtension(

std::string error;

scoped_refptr<Extension> screensaver_extension =

extension_file_util::LoadExtension(screensaver_extension_path,

- Extension::COMPONENT,

+ extensions::Manifest::COMPONENT,

Extension::NO_FLAGS,

&error);

if (!screensaver_extension) {

@@ -186,7 +186,7 @@ void KioskModeScreensaver::ScreensaverPathCallback(

new SandboxedUnpacker(

screensaver_crx,

true,

- Extension::COMPONENT,

+ extensions::Manifest::COMPONENT,

Extension::NO_FLAGS,

extensions_dir,

content::BrowserThread::GetMessageLoopProxyForThread(

« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/extensions/admin_policy.cc » ('j') | no next file with comments »