chrome/browser/extensions/component_loader.cc - Issue 11048045: Allow settings dialog to be opened via the app launcher, as a packaged app.

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 11048045: Allow settings dialog to be opened via the app launcher, as a packaged app. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: stray GetSiteInstance in DLOG Created 8 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/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/extensions/image_loading_tracker.cc » ('j') | chrome/browser/ui/extensions/shell_window.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

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

index 683a39329a2efa7819b39bd3e019db852f8c14b0..3062461d5cece00f233f7e935aae0a5bcbd0f5d1 100644

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

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

@@ -372,6 +372,14 @@ void ComponentLoader::AddDefaultComponentExtensions() {

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

+#if defined(OS_WIN)

+ if (CommandLine::ForCurrentProcess()

benwells 2012/10/15 02:04:42 nit: indent like this: if (CommandLine::ForCurre

tapted 2012/10/15 02:32:39 Done.

+ ->HasSwitch(switches::kEnableSettingsApp)) {

+ Add(IDR_SETTINGS_APP_MANIFEST,

+ FilePath(FILE_PATH_LITERAL("settings_app")));

+ }

+#endif

#if !defined(OS_CHROMEOS)

// Cloud Print component app. Not required on Chrome OS.

Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print")));