chrome/browser/extensions/component_loader.cc - Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines.

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/extensions/component_loader.cc

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 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

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index dc99e22ea503dd43e7e53272293d4efc6036602e..553209debcd3f80d3c5c0fb1e7b260e007781390 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -368,7 +368,7 @@ void ComponentLoader::AddDefaultComponentExtensions() {

Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store")));

-#if defined(OS_WIN)

+#if defined(ENABLE_SETTINGS_APP)

Add(IDR_SETTINGS_APP_MANIFEST, FilePath(FILE_PATH_LITERAL("settings_app")));

#endif

« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »