chrome/browser/shell_integration.cc - Issue 3522015: Implement new strategy for default apps

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

Issue 3522015: Implement new strategy for default apps (Closed)

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

Index: chrome/browser/shell_integration.cc

diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc

index 3ed45ae761f2f937a8c955d3883d5dd537cab0b6..c51ed25af9ae88ec9273be7bccefede6c0d0467a 100644

--- a/chrome/browser/shell_integration.cc

+++ b/chrome/browser/shell_integration.cc

@@ -42,7 +42,7 @@ std::string ShellIntegration::GetCommandLineArgumentsCommon(const GURL& url,

// If |extension_app_id| is present, we use the kAppId switch rather than

// the kApp switch (the launch url will be read from the extension app

// during launch.

- if (!cmd.HasSwitch(switches::kDisableApps) && !extension_app_id.empty()) {

+ if (!extension_app_id.empty()) {

arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) +

L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id));

} else {

« no previous file with comments | « chrome/browser/resources/ntp/apps.js ('k') | chrome/browser/utility_process_host.cc » ('j') | no next file with comments »