chrome/browser/extensions/extension_prefs.cc - Issue 10080017: Switch platform apps from a declarative launch container to handling an onLaunched event.

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/extension_prefs.cc

Issue 10080017: Switch platform apps from a declarative launch container to handling an onLaunched event. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: remove debug logging code Created 8 years, 8 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/extension_function_registry.cc ('k') | chrome/browser/extensions/extension_tabs_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_prefs.cc

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

index 793a04ed61d02e95f23e532ede4f1ea559b2950f..8aa723a8d354e95d69688b662352a751a029e328 100644

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

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

@@ -1038,12 +1038,10 @@ extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(

extension_misc::LaunchContainer result = kInvalidLaunchContainer;

- if (manifest_launch_container == extension_misc::LAUNCH_PANEL ||

- manifest_launch_container == extension_misc::LAUNCH_SHELL) {

- // Apps with app.launch.container = 'panel' or 'shell' should always respect

- // the manifest setting.

+ if (manifest_launch_container == extension_misc::LAUNCH_PANEL) {

+ // Apps with app.launch.container = 'panel' should always respect the

+ // manifest setting.

result = manifest_launch_container;

} else if (manifest_launch_container == extension_misc::LAUNCH_TAB) {

// Look for prefs that indicate the user's choice of launch

// container. The app's menu on the NTP provides a UI to set

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